Skip to content

Commit

Permalink
Merge pull request #100 from codefresh-io/fix/monorepo-extraenv
Browse files Browse the repository at this point in the history
fix: extra env in acr controller deployment.yaml
  • Loading branch information
pasha-codefresh authored Oct 4, 2024
2 parents 48368ae + d9fe073 commit 5791b7f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions charts/argo-cd/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ 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-a87492b22
version: 7.4.7-2-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:
Expand All @@ -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-a87492b22 with removing secrets and cm watcher
description: Fix extra env in acr controller deployment.yaml
2 changes: 1 addition & 1 deletion charts/argo-cd/templates/acr-controller/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
name: {{ .Values.acrController.name }}
env:
{{- with (concat .Values.global.env .Values.acrController.env) }}
{{- toYaml . | nindent 10 }}
{{- toYaml . | nindent 12 }}
{{- end }}
- name: ARGOCD_TOKEN
valueFrom:
Expand Down

0 comments on commit 5791b7f

Please sign in to comment.