Merge pull request #99 from codefresh-io/fix/monorepo-extra-env

fix: support monorepo controller deployment extra env
codefresh-io · Oct 3, 2024 · 48368ae · 48368ae
2 parents fcfba0a + 18739f6
commit 48368ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: v2.12-2024.9.23-0dc32342c
+appVersion: v2.12-2024.9.30-a87492b22
 kubeVersion: ">=1.23.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 7.4.7-1-cap-2.12-2024.9.30-995854136
+version: 7.4.7-1-cap-2.12-2024.9.30-a87492b22
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -27,4 +27,4 @@ annotations:
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: changed
-      description: Upgrade argo-cd to v2.12-2024.9.30-995854136 with upgrading helm to 3.15.4
+      description: Upgrade argo-cd to v2.12-2024.9.30-a87492b22 with removing secrets and cm watcher
diff --git a/charts/argo-cd/templates/acr-controller/deployment.yaml b/charts/argo-cd/templates/acr-controller/deployment.yaml
@@ -56,11 +56,9 @@ spec:
         imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.acrController.image.imagePullPolicy }}
         name: {{ .Values.acrController.name }}
         env:
-          {{- with (concat .Values.global.env .Values.acrController.env) }}
-            {{- toYaml . | nindent 10 }}
-          {{- end }}
-            - name: ARGOCD_SERVER
-              value: "http://argocd-server:80"
+            {{- with (concat .Values.global.env .Values.acrController.env) }}
+              {{- toYaml . | nindent 10 }}
+            {{- end }}
             - name: ARGOCD_TOKEN
               valueFrom:
                 secretKeyRef: