fix(argo-cd): Merge duplicate initContainer entries introduced in 3.29.0 (#1058)

* fix(repo-server): merge initContainer to one section

Signed-off-by: Alex Babel <alexander.babel@icloud.com>

* chore(argo-cd): bump version to 3.29.1

Signed-off-by: Alex Babel <alexander.babel@icloud.com>

* Merge master into fix/repo-server-init-container

Signed-off-by: Alex Babel <alexander.babel@icloud.com>

* fix(argo-cd): add enableCopyutilInitContainer option

Signed-off-by: Alex Babel <alexander.babel@icloud.com>

* doc: update readme

Signed-off-by: Alex Babel <alexander.babel@icloud.com>

charts/argo-cd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.2.1
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.29.1
+version: 3.29.2
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@@ -21,4 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Update to app version 2.2.1"
+    - "[Fix]: repo-server: merge initContainer to one section"

charts/argo-cd/README.md

@@ -316,6 +316,7 @@ NAME: my-release
 | repoServer.clusterRoleRules.rules | list | `[]` | List of custom rules for the Repo server's Cluster Role resource |
 | repoServer.containerPort | int | `8081` | Configures the repo server port |
 | repoServer.containerSecurityContext | object | `{}` | Repo server container-level security context |
+| repoServer.enableCopyutilInitContainer | bool | `true` | Enable the copyutil init container |
 | repoServer.env | list | `[]` | Environment variables to pass to repo server |
 | repoServer.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to repo server |
 | repoServer.extraArgs | list | `[]` | Additional command line arguments to pass to repo server |

charts/argo-cd/templates/argocd-repo-server/deployment.yaml

@@ -34,17 +34,6 @@ spec:
       {{- if .Values.global.securityContext }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       {{- end }}
-      initContainers:
-      - command:
-        - cp
-        - -n
-        - /usr/local/bin/argocd
-        - /var/run/argocd/argocd-cmp-server
-        image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }}
-        name: copyutil
-        volumeMounts:
-        - mountPath: /var/run/argocd
-          name: var-files
       containers:
       - name: {{ .Values.repoServer.name }}
         image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }}
@@ -194,10 +183,24 @@ spec:
         name: var-files
       - emptyDir: {}
         name: plugins
-      {{- if .Values.repoServer.initContainers }}
+      {{- if or .Values.repoServer.initContainers .Values.repoServer.enableCopyutilInitContainer }}
       initContainers:
+      {{- if .Values.repoServer.enableCopyutilInitContainer }}
+      - command:
+        - cp
+        - -n
+        - /usr/local/bin/argocd
+        - /var/run/argocd/argocd-cmp-server
+        image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }}
+        name: copyutil
+        volumeMounts:
+        - mountPath: /var/run/argocd
+          name: var-files
+      {{- end }}
+      {{- if .Values.repoServer.initContainers }}
       {{- toYaml .Values.repoServer.initContainers | nindent 6 }}
       {{- end }}
+      {{- end }}
 {{- if .Values.repoServer.priorityClassName }}
       priorityClassName: {{ .Values.repoServer.priorityClassName }}
 {{- end }}

charts/argo-cd/values.yaml

@@ -1530,6 +1530,9 @@ repoServer:
   #    name: custom-tools
   #    subPath: helm
 
+  # -- Enable the copyutil init container
+  enableCopyutilInitContainer: true
+
 ## Argo Configs
 configs:
   # -- Provide one or multiple [external cluster credentials]