Skip to content

Commit 48368ae

Browse files
Merge pull request #99 from codefresh-io/fix/monorepo-extra-env
fix: support monorepo controller deployment extra env
2 parents fcfba0a + 18739f6 commit 48368ae

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

charts/argo-cd/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: v2
2-
appVersion: v2.12-2024.9.23-0dc32342c
2+
appVersion: v2.12-2024.9.30-a87492b22
33
kubeVersion: ">=1.23.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 7.4.7-1-cap-2.12-2024.9.30-995854136
6+
version: 7.4.7-1-cap-2.12-2024.9.30-a87492b22
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -27,4 +27,4 @@ annotations:
2727
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
2828
artifacthub.io/changes: |
2929
- kind: changed
30-
description: Upgrade argo-cd to v2.12-2024.9.30-995854136 with upgrading helm to 3.15.4
30+
description: Upgrade argo-cd to v2.12-2024.9.30-a87492b22 with removing secrets and cm watcher

charts/argo-cd/templates/acr-controller/deployment.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,9 @@ spec:
5656
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.acrController.image.imagePullPolicy }}
5757
name: {{ .Values.acrController.name }}
5858
env:
59-
{{- with (concat .Values.global.env .Values.acrController.env) }}
60-
{{- toYaml . | nindent 10 }}
61-
{{- end }}
62-
- name: ARGOCD_SERVER
63-
value: "http://argocd-server:80"
59+
{{- with (concat .Values.global.env .Values.acrController.env) }}
60+
{{- toYaml . | nindent 10 }}
61+
{{- end }}
6462
- name: ARGOCD_TOKEN
6563
valueFrom:
6664
secretKeyRef:

0 commit comments

Comments
 (0)