Merge pull request #157 from appuio/fix/forwarder-skip-dry-run-on-mis…

…sing-resource Fix initial sync for `ClusterLogForwarder` resources
appuio · Nov 19, 2024 · 8710667 · 8710667
2 parents 85f5517 + 022fb85
commit 8710667
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/component/config_forwarding.libsonnet b/component/config_forwarding.libsonnet
@@ -225,6 +225,11 @@ local unfoldSpecs(specs) = {
 // ClusterLogForwarder:
 // Create definitive ClusterLogForwarder resource from specs.
 local clusterLogForwarder = lib.ClusterLogForwarder(params.namespace, 'instance') {
+  metadata+: {
+    annotations+: {
+      'argocd.argoproj.io/sync-options': 'SkipDryRunOnMissingResource=true',
+    },
+  },
   spec: unfoldSpecs(clusterLogForwarderSpec),
 };
 
@@ -243,6 +248,11 @@ local namespaceLogForwarder = [
   local serviceAccount = std.get(specs, 'serviceAccountName', utils.namespacedName(forwarder).name);
 
   lib.ClusterLogForwarder(namespace, name) {
+    metadata+: {
+      annotations+: {
+        'argocd.argoproj.io/sync-options': 'SkipDryRunOnMissingResource=true',
+      },
+    },
     spec: { serviceAccountName: serviceAccount } + com.makeMergeable(unfoldSpecs(specs)),
   }
   for forwarder in std.objectFields(params.namespaceLogForwarder)

diff --git a/tests/golden/legacy/openshift4-logging/openshift4-logging/31_cluster_logforwarding.yaml b/tests/golden/legacy/openshift4-logging/openshift4-logging/31_cluster_logforwarding.yaml
@@ -1,7 +1,8 @@
 apiVersion: logging.openshift.io/v1
 kind: ClusterLogForwarder
 metadata:
-  annotations: {}
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
   labels:
     name: instance
   name: instance

diff --git a/tests/golden/master/openshift4-logging/openshift4-logging/31_cluster_logforwarding.yaml b/tests/golden/master/openshift4-logging/openshift4-logging/31_cluster_logforwarding.yaml
@@ -1,7 +1,8 @@
 apiVersion: logging.openshift.io/v1
 kind: ClusterLogForwarder
 metadata:
-  annotations: {}
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
   labels:
     name: instance
   name: instance

diff --git a/tests/golden/master/openshift4-logging/openshift4-logging/32_namespace_logforwarding.yaml b/tests/golden/master/openshift4-logging/openshift4-logging/32_namespace_logforwarding.yaml
@@ -1,7 +1,8 @@
 apiVersion: logging.openshift.io/v1
 kind: ClusterLogForwarder
 metadata:
-  annotations: {}
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
   labels:
     name: bar
   name: bar
@@ -27,7 +28,8 @@ spec:
 apiVersion: logging.openshift.io/v1
 kind: ClusterLogForwarder
 metadata:
-  annotations: {}
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
   labels:
     name: hands
   name: hands

diff --git a/...s/golden/multilineerr/openshift4-logging/openshift4-logging/31_cluster_logforwarding.yaml b/...s/golden/multilineerr/openshift4-logging/openshift4-logging/31_cluster_logforwarding.yaml
@@ -1,7 +1,8 @@
 apiVersion: logging.openshift.io/v1
 kind: ClusterLogForwarder
 metadata:
-  annotations: {}
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
   labels:
     name: instance
   name: instance