From a6a2d1b1db72c0f8805678db8e410324c8afb772 Mon Sep 17 00:00:00 2001
From: Marc Brugger <github@bakito.ch>
Date: Thu, 8 Sep 2022 18:59:42 +0200
Subject: [PATCH] Handle additional initContainers correctly in the dex
 deployment (#1442)

Signed-off-by: bakito <github@bakito.ch>
---
 charts/argo-cd/Chart.yaml                    | 4 ++--
 charts/argo-cd/templates/dex/deployment.yaml | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 174c0f5e..30c47953 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.4.11
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.4.2
+version: 5.4.3
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@@ -19,4 +19,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Add priorityClassName to notifications controller"
+    - "[Fixed]: Additional initContainers are handled correctly in the dex deployment"
diff --git a/charts/argo-cd/templates/dex/deployment.yaml b/charts/argo-cd/templates/dex/deployment.yaml
index 3861ee3f..6ce4a36d 100755
--- a/charts/argo-cd/templates/dex/deployment.yaml
+++ b/charts/argo-cd/templates/dex/deployment.yaml
@@ -47,6 +47,9 @@ spec:
         volumeMounts:
         - mountPath: /shared
           name: static-files
+      {{- if .Values.dex.initContainers }}
+      {{- toYaml .Values.dex.initContainers | nindent 6 }}
+      {{- end }}
       containers:
       - name: {{ .Values.dex.name }}
         image: {{ .Values.dex.image.repository }}:{{ .Values.dex.image.tag }}
@@ -146,10 +149,6 @@ spec:
       {{- if .Values.dex.extraVolumes }}
       {{- toYaml .Values.dex.extraVolumes | nindent 6 }}
       {{- end }}
-      {{- if .Values.dex.initContainers }}
-      initContainers:
-      {{- toYaml .Values.dex.initContainers | nindent 6 }}
-      {{- end }}
 {{- if .Values.dex.priorityClassName }}
       priorityClassName: {{ .Values.dex.priorityClassName }}
 {{- end }}