feat: argo-cd v2.7.11

Signed-off-by: Jesse Suen <[email protected]>
akuity · Aug 9, 2023 · fad8042 · fad8042
1 parent 1c4c4bf
commit fad8042
Show file tree

Hide file tree

Showing 53 changed files with 1,430 additions and 297 deletions.
diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-version: v2.7.11-ak.0.0
-appVersion: v2.7.11
+version: 2.7.11-ak.0.0
+appVersion: 2.7.11
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
 home: https://charts.akuity.io

diff --git a/charts/argo-cd/crds/crd-application.yaml b/charts/argo-cd/crds/crd-application.yaml
diff --git a/charts/argo-cd/crds/crd-applicationset.yaml b/charts/argo-cd/crds/crd-applicationset.yaml
diff --git a/charts/argo-cd/templates/_helpers.tpl b/charts/argo-cd/templates/_helpers.tpl
@@ -10,6 +10,7 @@ Returns the supplied image tag if defined, then the global tag, then the chart v
 {{- if .image.tag -}}
   {{- $repository }}:{{- .image.tag -}}
 {{- else -}}
-  {{- $repository }}:{{- default .root.Chart.Version .root.Values.global.image.tag -}}
+  {{- $imageFromChartVersion := print "v" (regexReplaceAllLiteral "\\.[0-9]+$" .root.Chart.Version "") }}
+  {{- $repository }}:{{- default $imageFromChartVersion .root.Values.global.image.tag -}}
 {{- end -}}
 {{- end -}}
diff --git a/charts/argo-cd/templates/application-controller/metrics-service.yaml b/charts/argo-cd/templates/application-controller/metrics-service.yaml
@@ -6,11 +6,12 @@ metadata:
     app.kubernetes.io/name: argocd-metrics
     app.kubernetes.io/part-of: argocd
   name: argocd-metrics
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
   - name: metrics
     port: 8082
     protocol: TCP
     targetPort: 8082
   selector:
-    app.kubernetes.io/name: argocd-application-controller
+    app.kubernetes.io/name: argocd-application-controller
diff --git a/charts/argo-cd/templates/application-controller/networkpolicy.yaml b/charts/argo-cd/templates/application-controller/networkpolicy.yaml
@@ -2,6 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   name: argocd-application-controller-network-policy
+  namespace: {{ .Release.Namespace }}
 spec:
   ingress:
   - from:
@@ -12,4 +13,4 @@ spec:
     matchLabels:
       app.kubernetes.io/name: argocd-application-controller
   policyTypes:
-  - Ingress
+  - Ingress
diff --git a/charts/argo-cd/templates/application-controller/rbac.yaml b/charts/argo-cd/templates/application-controller/rbac.yaml
@@ -6,6 +6,7 @@ metadata:
     app.kubernetes.io/name: argocd-application-controller
     app.kubernetes.io/part-of: argocd
   name: argocd-application-controller
+  namespace: {{ .Release.Namespace }}
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -16,6 +17,7 @@ metadata:
     app.kubernetes.io/name: argocd-application-controller
     app.kubernetes.io/part-of: argocd
   name: argocd-application-controller
+  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups:
   - ""
@@ -56,6 +58,7 @@ metadata:
     app.kubernetes.io/name: argocd-application-controller
     app.kubernetes.io/part-of: argocd
   name: argocd-application-controller
+  namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/charts/argo-cd/templates/application-controller/statefulset.yaml b/charts/argo-cd/templates/application-controller/statefulset.yaml
@@ -6,6 +6,7 @@ metadata:
     app.kubernetes.io/name: argocd-application-controller
     app.kubernetes.io/part-of: argocd
   name: argocd-application-controller
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.controller.replicas }}
   selector:
@@ -33,10 +34,8 @@ spec:
               topologyKey: kubernetes.io/hostname
             weight: 5
       containers:
-      - command:
-        - argocd-application-controller
-        - --redis
-        - argocd-redis-ha-haproxy:6379
+      - args:
+        - /usr/local/bin/argocd-application-controller
         {{- with .Values.controller.extraArgs }}
         {{- . | toYaml | nindent 8 }}
         {{- end }}
@@ -48,6 +47,11 @@ spec:
         {{- with .Values.controller.env }}
           {{- toYaml . | nindent 10 }}
         {{- end }}
+        - name: ARGOCD_REDIS
+          valueFrom:
+            configMapKeyRef:
+              key: redis.server
+              name: argocd-cmd-params-cm
         - name: ARGOCD_CONTROLLER_REPLICAS
           value: {{ .Values.controller.replicas | quote }}
         - name: ARGOCD_RECONCILIATION_TIMEOUT
@@ -170,6 +174,12 @@ spec:
               key: application.namespaces
               name: argocd-cmd-params-cm
               optional: true
+        - name: ARGOCD_APPLICATION_CONTROLLER_KUBECTL_PARALLELISM_LIMIT
+          valueFrom:
+            configMapKeyRef:
+              key: controller.kubectl.parallelism.limit
+              name: argocd-cmd-params-cm
+              optional: true
         image: {{ include "argo-cd.image" (dict "root" . "image" .Values.controller.image ) }}
         imagePullPolicy: {{ default .Values.global.image.pullPolicy .Values.controller.image.pullPolicy }}
         name: argocd-application-controller

diff --git a/charts/argo-cd/templates/applicationset-controller/deployment.yaml b/charts/argo-cd/templates/applicationset-controller/deployment.yaml
@@ -3,9 +3,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app.kubernetes.io/component: controller
+    app.kubernetes.io/component: applicationset-controller
     app.kubernetes.io/name: argocd-applicationset-controller
-    app.kubernetes.io/part-of: argocd-applicationset
+    app.kubernetes.io/part-of: argocd
   name: argocd-applicationset-controller
   namespace: {{ .Release.Namespace }}
 spec:
@@ -18,9 +18,8 @@ spec:
         app.kubernetes.io/name: argocd-applicationset-controller
     spec:
       containers:
-      - command:
-        - entrypoint.sh
-        - argocd-applicationset-controller
+      - args:
+        - /usr/local/bin/argocd-applicationset-controller
         env:
         - name: NAMESPACE
           valueFrom:
@@ -86,7 +85,7 @@ spec:
               key: applicationsetcontroller.enable.progressive.syncs
               name: argocd-cmd-params-cm
               optional: true
-        image: {{ default .Values.global.image.repository .Values.applicationsetController.image.repository }}:{{ default .Values.global.image.tag .Values.applicationsetController.image.tag }}
+        image: {{ include "argo-cd.image" (dict "root" . "image" .Values.applicationsetController.image ) }}
         imagePullPolicy: {{ default .Values.global.image.pullPolicy .Values.applicationsetController.image.pullPolicy }}
         name: argocd-applicationset-controller
         ports:
@@ -98,7 +97,7 @@ spec:
           allowPrivilegeEscalation: false
           capabilities:
             drop:
-              - ALL
+            - ALL
           readOnlyRootFilesystem: true
           runAsNonRoot: true
           seccompProfile:

diff --git a/charts/argo-cd/templates/applicationset-controller/networkpolicy.yaml b/charts/argo-cd/templates/applicationset-controller/networkpolicy.yaml
@@ -0,0 +1,21 @@
+{{- if .Values.applicationsetController.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: argocd-applicationset-controller-network-policy
+  namespace: {{ .Release.Namespace }}
+spec:
+  ingress:
+  - from:
+    - namespaceSelector: {}
+    ports:
+    - port: 7000
+      protocol: TCP
+    - port: 8080
+      protocol: TCP
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/name: argocd-applicationset-controller
+  policyTypes:
+  - Ingress
+{{- end }}
diff --git a/charts/argo-cd/templates/applicationset-controller/rbac.yaml b/charts/argo-cd/templates/applicationset-controller/rbac.yaml
@@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    app.kubernetes.io/component: controller
+    app.kubernetes.io/component: applicationset-controller
     app.kubernetes.io/name: argocd-applicationset-controller
-    app.kubernetes.io/part-of: argocd-applicationset
+    app.kubernetes.io/part-of: argocd
   name: argocd-applicationset-controller
   namespace: {{ .Release.Namespace }}
 rules:
@@ -65,14 +65,15 @@ rules:
   - get
   - list
   - watch
+
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    app.kubernetes.io/component: controller
+    app.kubernetes.io/component: applicationset-controller
     app.kubernetes.io/name: argocd-applicationset-controller
-    app.kubernetes.io/part-of: argocd-applicationset
+    app.kubernetes.io/part-of: argocd
   name: argocd-applicationset-controller
   namespace: {{ .Release.Namespace }}
 roleRef:
@@ -88,9 +89,9 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app.kubernetes.io/component: controller
+    app.kubernetes.io/component: applicationset-controller
     app.kubernetes.io/name: argocd-applicationset-controller
-    app.kubernetes.io/part-of: argocd-applicationset
+    app.kubernetes.io/part-of: argocd
   name: argocd-applicationset-controller
   namespace: {{ .Release.Namespace }}
 {{- end }}
diff --git a/charts/argo-cd/templates/applicationset-controller/service.yaml b/charts/argo-cd/templates/applicationset-controller/service.yaml
@@ -3,9 +3,9 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app.kubernetes.io/component: controller
+    app.kubernetes.io/component: applicationset-controller
     app.kubernetes.io/name: argocd-applicationset-controller
-    app.kubernetes.io/part-of: argocd-applicationset
+    app.kubernetes.io/part-of: argocd
   name: argocd-applicationset-controller
   namespace: {{ .Release.Namespace }}
 spec:

diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/name: argocd-server
     app.kubernetes.io/part-of: argocd
   name: argocd-server
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.server.replicas }}
   selector:
@@ -24,18 +25,16 @@ spec:
               labelSelector:
                 matchLabels:
                   app.kubernetes.io/name: argocd-server
-              topologyKey: failure-domain.beta.kubernetes.io/zone
+              topologyKey: topology.kubernetes.io/zone
             weight: 100
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
                 app.kubernetes.io/name: argocd-server
             topologyKey: kubernetes.io/hostname
       containers:
-      - command:
-        - argocd-server
-        - --redis
-        - argocd-redis-ha-haproxy:6379
+      - args:
+        - /usr/local/bin/argocd-server
         {{- if .Values.server.insecure}}
         - --insecure
         {{- end }}
@@ -52,6 +51,11 @@ spec:
         {{- end }}
         - name: ARGOCD_API_SERVER_REPLICAS
           value: {{ .Values.server.replicas | quote }}
+        - name: ARGOCD_REDIS
+          valueFrom:
+            configMapKeyRef:
+              key: redis.server
+              name: argocd-cmd-params-cm
         - name: ARGOCD_SERVER_INSECURE
           valueFrom:
             configMapKeyRef:

diff --git a/charts/argo-cd/templates/argocd-server/metrics-service.yaml b/charts/argo-cd/templates/argocd-server/metrics-service.yaml
@@ -7,6 +7,7 @@ metadata:
     app.kubernetes.io/name: argocd-server-metrics
     app.kubernetes.io/part-of: argocd
   name: argocd-server-metrics
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
   - name: metrics

diff --git a/charts/argo-cd/templates/argocd-server/networkpolicy.yaml b/charts/argo-cd/templates/argocd-server/networkpolicy.yaml
@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   name: argocd-server-network-policy
+  namespace: {{ .Release.Namespace }}
 spec:
   ingress:
   - {}

diff --git a/charts/argo-cd/templates/argocd-server/rbac.yaml b/charts/argo-cd/templates/argocd-server/rbac.yaml
@@ -7,16 +7,7 @@ metadata:
     app.kubernetes.io/name: argocd-server
     app.kubernetes.io/part-of: argocd
   name: argocd-server
-
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    app.kubernetes.io/component: repo-server
-    app.kubernetes.io/name: argocd-repo-server
-    app.kubernetes.io/part-of: argocd
-  name: argocd-repo-server
+  namespace: {{ .Release.Namespace }}
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -27,6 +18,7 @@ metadata:
     app.kubernetes.io/name: argocd-server
     app.kubernetes.io/part-of: argocd
   name: argocd-server
+  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups:
   - ""
@@ -72,6 +64,7 @@ metadata:
     app.kubernetes.io/name: argocd-server
     app.kubernetes.io/part-of: argocd
   name: argocd-server
+  namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/charts/argo-cd/templates/argocd-server/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml
@@ -1,11 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: argocd-server
   labels:
     app.kubernetes.io/component: server
     app.kubernetes.io/name: argocd-server
     app.kubernetes.io/part-of: argocd
+  name: argocd-server
+  namespace: {{ .Release.Namespace }}
 spec:
 {{- if .Values.server.service.type }}
   type: {{ .Values.server.service.type }}

diff --git a/charts/argo-cd/templates/config/argocd-cm-params-cm.yaml b/charts/argo-cd/templates/config/argocd-cm-params-cm.yaml
@@ -1,10 +1,11 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: argocd-cmd-params-cm
   labels:
     app.kubernetes.io/name: argocd-cmd-params-cm
     app.kubernetes.io/part-of: argocd
+  name: argocd-cmd-params-cm
+  namespace: {{ .Release.Namespace }}
 {{- with .Values.config.params }}
 data:
 {{- toYaml . | nindent 2}}

diff --git a/charts/argo-cd/templates/config/argocd-cm.yaml b/charts/argo-cd/templates/config/argocd-cm.yaml
@@ -1,10 +1,11 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: argocd-cm
   labels:
     app.kubernetes.io/name: argocd-cm
     app.kubernetes.io/part-of: argocd
+  name: argocd-cm
+  namespace: {{ .Release.Namespace }}
 {{- with .Values.config.argocd }}
 data:
 {{- toYaml . | nindent 2}}

diff --git a/charts/argo-cd/templates/config/argocd-gpg-keys-cm.yaml b/charts/argo-cd/templates/config/argocd-gpg-keys-cm.yaml
@@ -1,10 +1,11 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: argocd-gpg-keys-cm
   labels:
     app.kubernetes.io/name: argocd-gpg-keys-cm
     app.kubernetes.io/part-of: argocd
+  name: argocd-gpg-keys-cm
+  namespace: {{ .Release.Namespace }}
 {{- with .Values.config.gpgKeys }}
 data:
 {{- toYaml . | nindent 2}}

diff --git a/charts/argo-cd/templates/config/argocd-rbac-cm.yaml b/charts/argo-cd/templates/config/argocd-rbac-cm.yaml
@@ -1,10 +1,11 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: argocd-rbac-cm
   labels:
     app.kubernetes.io/name: argocd-rbac-cm
     app.kubernetes.io/part-of: argocd
+  name: argocd-rbac-cm
+  namespace: {{ .Release.Namespace }}
 {{- with .Values.config.rbac }}
 data:
 {{- toYaml . | nindent 2}}