Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chart/chart-index/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version: 0.1.0
dependencies:
- name: argo-cd
alias: argocd
version: 9.5.16
version: 9.5.17
repository: https://argoproj.github.io/argo-helm
- name: argocd-image-updater
version: 1.1.5
Expand Down
6 changes: 3 additions & 3 deletions charts/argocd/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
annotations:
artifacthub.io/changes: |
- kind: changed
description: Bump argo-cd to v3.4.3
- kind: fixed
description: Fix env vars ordering to allow user overrides via controller.env.
artifacthub.io/signKey: |
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
Expand All @@ -28,4 +28,4 @@ name: argo-cd
sources:
- https://github.com/argoproj/argo-cd
- https://github.com/argoproj/argo-helm/tree/main/charts/argo-cd
version: 9.5.16
version: 9.5.17
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ spec:
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.controller.image.imagePullPolicy }}
name: {{ .Values.controller.name }}
env:
{{- with (concat .Values.global.env .Values.controller.env) }}
{{- tpl (toYaml .) $ | nindent 10 }}
{{- end }}
- name: ARGOCD_CONTROLLER_REPLICAS
value: {{ .Values.controller.replicas | quote }}
- name: ARGOCD_APPLICATION_CONTROLLER_NAME
Expand Down Expand Up @@ -361,6 +358,9 @@ spec:
optional: true
- name: KUBECACHEDIR
value: /tmp/kubecache
{{- with (concat .Values.global.env .Values.controller.env) }}
{{- tpl (toYaml .) $ | nindent 10 }}
{{- end }}
{{- with .Values.controller.envFrom }}
envFrom:
{{- toYaml . | nindent 10 }}
Expand Down
Loading