Merge pull request #3 from appuio/fix-argo-annotations

Don't prune generated CA bundles
appuio · Nov 8, 2022 · 515bfd6 · 515bfd6
2 parents c2e9143 + c1df3d9
commit 515bfd6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/component/main.jsonnet b/component/main.jsonnet
@@ -8,6 +8,13 @@ local params = inv.parameters.openshift4_proxy;
 local has_ca_bundle = params.trustedCA != null;
 local ca_bundle_name = 'user-ca-bundle';
 local ca_bundle = kube.ConfigMap(ca_bundle_name) {
+  metadata+: {
+    annotations+: {
+      // configure ArgoCD to ignore the copy of this configmap which is created by OpenShift
+      'argocd.argoproj.io/sync-options': 'Prune=false',
+      'argocd.argoproj.io/compare-options': 'IgnoreExtraneous',
+    },
+  },
   data: {
     'ca-bundle.crt': params.trustedCA,
   },

diff --git a/tests/golden/proxy/openshift4-proxy/openshift4-proxy/user-ca-bundle.yaml b/tests/golden/proxy/openshift4-proxy/openshift4-proxy/user-ca-bundle.yaml
@@ -9,7 +9,9 @@ data:
     '
 kind: ConfigMap
 metadata:
-  annotations: {}
+  annotations:
+    argocd.argoproj.io/compare-options: IgnoreExtraneous
+    argocd.argoproj.io/sync-options: Prune=false
   labels:
     name: user-ca-bundle
   name: user-ca-bundle