Merge branch 'master' into feat/upgrade-notification-engine

pasha-codefresh · Jun 22, 2023 · f9af0d6 · f9af0d6
2 parents 39410f7 + c55ae0e
commit f9af0d6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
diff --git a/manifests/base/applicationset-controller/argocd-applicationset-controller-deployment.yaml b/manifests/base/applicationset-controller/argocd-applicationset-controller-deployment.yaml
@@ -54,6 +54,7 @@ spec:
                 configMapKeyRef:
                   key: applicationsetcontroller.policy
                   name: argocd-cmd-params-cm
+                  optional: true
             - name: ARGOCD_APPLICATIONSET_CONTROLLER_ENABLE_POLICY_OVERRIDE
               valueFrom:
                 configMapKeyRef:

diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml
@@ -18292,6 +18292,7 @@ spec:
             configMapKeyRef:
               key: applicationsetcontroller.policy
               name: argocd-cmd-params-cm
+              optional: true
         - name: ARGOCD_APPLICATIONSET_CONTROLLER_ENABLE_POLICY_OVERRIDE
           valueFrom:
             configMapKeyRef:

diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
@@ -19529,6 +19529,7 @@ spec:
             configMapKeyRef:
               key: applicationsetcontroller.policy
               name: argocd-cmd-params-cm
+              optional: true
         - name: ARGOCD_APPLICATIONSET_CONTROLLER_ENABLE_POLICY_OVERRIDE
           valueFrom:
             configMapKeyRef:

diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
@@ -1550,6 +1550,7 @@ spec:
             configMapKeyRef:
               key: applicationsetcontroller.policy
               name: argocd-cmd-params-cm
+              optional: true
         - name: ARGOCD_APPLICATIONSET_CONTROLLER_ENABLE_POLICY_OVERRIDE
           valueFrom:
             configMapKeyRef:

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -18630,6 +18630,7 @@ spec:
             configMapKeyRef:
               key: applicationsetcontroller.policy
               name: argocd-cmd-params-cm
+              optional: true
         - name: ARGOCD_APPLICATIONSET_CONTROLLER_ENABLE_POLICY_OVERRIDE
           valueFrom:
             configMapKeyRef:

diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -651,6 +651,7 @@ spec:
             configMapKeyRef:
               key: applicationsetcontroller.policy
               name: argocd-cmd-params-cm
+              optional: true
         - name: ARGOCD_APPLICATIONSET_CONTROLLER_ENABLE_POLICY_OVERRIDE
           valueFrom:
             configMapKeyRef: