chore(argo-cd): Sync ApplicationSet deployment with upstream (#1545)

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

charts/argo-cd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.4.14
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.5.21
+version: 5.5.22
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -22,5 +22,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: Init container for repo-server should use main container resources"
+    - "[Changed]: Synced ApplicationSet deployment with upstream manifest"
-    - "[Removed]: Section repoServer.copyutil that is no longer needed"

charts/argo-cd/templates/argocd-applicationset/deployment.yaml

@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "argo-cd.applicationSet.fullname" . }}
+  name: {{ include "argo-cd.applicationSet.fullname" . }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.applicationSet.name "name" .Values.applicationSet.name) | nindent 4 }}
 spec:
@@ -28,13 +28,13 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "argo-cd.applicationSetServiceAccountName" . }}
       securityContext:
         {{- toYaml (mergeOverwrite (deepCopy .Values.global.securityContext) .Values.applicationSet.podSecurityContext) | nindent 8 }}
+      serviceAccountName: {{ include "argo-cd.applicationSetServiceAccountName" . }}
       containers:
         - name: {{ .Values.applicationSet.name }}
-          securityContext:
+          image: {{ default .Values.global.image.repository .Values.applicationSet.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.applicationSet.image.tag }}
-            {{- toYaml .Values.applicationSet.securityContext | nindent 12 }}
+          imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.applicationSet.image.imagePullPolicy }}
           command:
             - entrypoint.sh
             - argocd-applicationset-controller
@@ -47,7 +47,6 @@ spec:
             {{- if or (gt ( .Values.applicationSet.replicaCount | int64) 1) .Values.applicationSet.args.enableLeaderElection }}
             - --enable-leader-election=true
             {{- end }}
-            - --namespace={{ .Release.Namespace }}
             - --argocd-repo-server={{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
             - --policy={{ .Values.applicationSet.args.policy }}
             - --debug={{ .Values.applicationSet.args.debug }}
@@ -55,66 +54,49 @@ spec:
             {{- with .Values.applicationSet.extraArgs }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
-          image: {{ default .Values.global.image.repository .Values.applicationSet.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.applicationSet.image.tag }}
-          imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.applicationSet.image.imagePullPolicy }}
-          ports:
-            - name: http
-              containerPort: {{ (split ":" .Values.applicationSet.args.probeBindAddr)._1 }}
-              protocol: TCP
-            - name: metrics
-              containerPort: {{ (split ":" .Values.applicationSet.args.metricsAddr)._1 }}
-              protocol: TCP
-            - name: webhook
-              containerPort: 7000
-              protocol: TCP
-          {{- with .Values.applicationSet.extraEnv }}
           env:
+            {{- with .Values.applicationSet.extraEnv }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
           {{- with .Values.applicationSet.extraEnvFrom }}
           envFrom:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          ports:
+            - name: metrics
+              containerPort: {{ (split ":" .Values.applicationSet.args.metricsAddr)._1 }}
+              protocol: TCP
+            - name: probe
+              containerPort: {{ (split ":" .Values.applicationSet.args.probeBindAddr)._1 }}
+              protocol: TCP
+            - name: webhook
+              containerPort: 7000
+              protocol: TCP
           resources:
             {{- toYaml .Values.applicationSet.resources | nindent 12 }}
+          securityContext:
+            {{- toYaml .Values.applicationSet.securityContext | nindent 12 }}
           volumeMounts:
-            - mountPath: /tmp
+            {{- with .Values.applicationSet.extraVolumeMounts }}
-              name: tmp-dir
+              {{- toYaml . | nindent 12 }}
-            {{- if .Values.configs.knownHosts }}
+            {{- end }}
             - mountPath: /app/config/ssh
               name: ssh-known-hosts
-            {{- end }}
             - mountPath: /app/config/tls
               name: tls-certs
             - mountPath: /app/config/gpg/source
               name: gpg-keys
             - mountPath: /app/config/gpg/keys
               name: gpg-keyring
-            {{- with .Values.applicationSet.extraVolumeMounts }}
+            - mountPath: /tmp
-              {{- toYaml . | nindent 12 }}
+              name: tmp
-            {{- end }}
         {{- with .Values.applicationSet.extraContainers }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
-      volumes:
-      - emptyDir: {}
-        name: tmp-dir
-      {{- if .Values.configs.knownHosts }}
-      - configMap:
-          name: argocd-ssh-known-hosts-cm
-        name: ssh-known-hosts
-      {{- end }}
-      - configMap:
-          name: argocd-tls-certs-cm
-        name: tls-certs
-      - configMap:
-          name: argocd-gpg-keys-cm
-        name: gpg-keys
-      - emptyDir: {}
-        name: gpg-keyring
-      {{- with .Values.applicationSet.extraVolumes }}
-        {{- toYaml . | nindent 6 }}
-      {{- end }}
       {{- with .Values.applicationSet.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -130,4 +112,21 @@ spec:
       {{- with .Values.applicationSet.priorityClassName }}
       priorityClassName: {{ . }}
       {{- end }}
+      volumes:
+        {{- with .Values.applicationSet.extraVolumes }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+        - name: ssh-known-hosts
+          configMap:
+            name: argocd-ssh-known-hosts-cm
+        - name: tls-certs
+          configMap:
+            name: argocd-tls-certs-cm
+        - name: gpg-keys
+          configMap:
+            name: argocd-gpg-keys-cm
+        - name: gpg-keyring
+          emptyDir: {}
+        - name: tmp
+          emptyDir: {}
 {{- end }}

charts/argo-cd/templates/argocd-applicationset/role.yaml

@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ template "argo-cd.applicationSet.fullname" . }}
+  name: {{ include "argo-cd.applicationSet.fullname" . }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.applicationSet.name "name" .Values.applicationSet.name) | nindent 4 }}
 rules:
@@ -10,7 +10,6 @@ rules:
     - argoproj.io
     resources:
     - applications
-    - appprojects
     - applicationsets
     - applicationsets/finalizers
     verbs:
@@ -29,37 +28,30 @@ rules:
     - get
     - patch
     - update
+  - apiGroups:
+    - argoproj.io
+    resources:
+    - appprojects
+    verbs:
+    - get
   - apiGroups:
     - ""
     resources:
     - events
     verbs:
     - create
-    - delete
     - get
     - list
     - patch
-    - update
     - watch
   - apiGroups:
     - ""
     resources:
     - secrets
-    verbs:
-    - get
-    - list
-    - watch
-  - apiGroups:
-    - ""
-    resources:
     - configmaps
     verbs:
-    - create
-    - delete
     - get
     - list
-    - patch
-    - update
     - watch
   - apiGroups:
     - apps