backport applicationset

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

@@ -2,18 +2,11 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  {{- with (mergeOverwrite (deepCopy .Values.global.deploymentAnnotations) .Values.applicationSet.deploymentAnnotations) }}
-  annotations:
-    {{- range $key, $value := . }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
   name: {{ include "argo-cd.applicationSet.fullname" . }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.applicationSet.name "name" .Values.applicationSet.name) | nindent 4 }}
 spec:
   replicas: {{ .Values.applicationSet.replicaCount }}
-  revisionHistoryLimit: {{ .Values.global.revisionHistoryLimit }}
   selector:
     matchLabels:
       {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.applicationSet.name) | nindent 6 }}
@@ -35,10 +28,8 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.global.securityContext }}
       securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- toYaml (mergeOverwrite (deepCopy .Values.global.securityContext) .Values.applicationSet.podSecurityContext) | nindent 8 }}
       serviceAccountName: {{ include "argo-cd.applicationSetServiceAccountName" . }}
       containers:
         - name: {{ .Values.applicationSet.name }}
@@ -54,12 +45,13 @@ spec:
             - {{ default .Values.global.logging.level .Values.applicationSet.logLevel }}
             - --metrics-addr={{ .Values.applicationSet.args.metricsAddr }}
             - --probe-addr={{ .Values.applicationSet.args.probeBindAddr }}
+            {{- if or (gt ( .Values.applicationSet.replicaCount | int64) 1) .Values.applicationSet.args.enableLeaderElection }}
+            - --enable-leader-election=true
+            {{- end }}
+            - --argocd-repo-server={{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
             - --policy={{ .Values.applicationSet.args.policy }}
+            - --debug={{ .Values.applicationSet.args.debug }}
             - --dry-run={{ .Values.applicationSet.args.dryRun }}
-            - --logformat
-            - {{ default .Values.global.logging.format .Values.applicationSet.logFormat }}
-            - --loglevel
-            - {{ default .Values.global.logging.level .Values.applicationSet.logLevel }}
             {{- with .Values.applicationSet.extraArgs }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
@@ -85,30 +77,10 @@ spec:
             - name: webhook
               containerPort: 7000
               protocol: TCP
-          {{- if .Values.applicationSet.livenessProbe.enabled }}
-          livenessProbe:
-            tcpSocket:
-              port: probe
-            initialDelaySeconds: {{ .Values.applicationSet.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.applicationSet.livenessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.applicationSet.livenessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.applicationSet.livenessProbe.successThreshold }}
-            failureThreshold: {{ .Values.applicationSet.livenessProbe.failureThreshold }}
-          {{- end }}
-          {{- if .Values.applicationSet.readinessProbe.enabled }}
-          readinessProbe:
-            tcpSocket:
-              port: probe
-            initialDelaySeconds: {{ .Values.applicationSet.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.applicationSet.readinessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.applicationSet.readinessProbe.timeoutSeconds }}
-            successThreshold: {{ .Values.applicationSet.readinessProbe.successThreshold }}
-            failureThreshold: {{ .Values.applicationSet.readinessProbe.failureThreshold }}
-          {{- end }}
           resources:
             {{- toYaml .Values.applicationSet.resources | nindent 12 }}
           securityContext:
-            {{- toYaml .Values.applicationSet.containerSecurityContext | nindent 12 }}
+            {{- toYaml .Values.applicationSet.securityContext | nindent 12 }}
           volumeMounts:
             {{- with .Values.applicationSet.extraVolumeMounts }}
               {{- toYaml . | nindent 12 }}
@@ -158,4 +130,4 @@ spec:
           emptyDir: {}
         - name: tmp
           emptyDir: {}
-{{- end }}
+{{- end }}

charts/argo-cd/values.yaml

@@ -2174,8 +2174,12 @@ applicationSet:
     metricsAddr: :8080
     # -- The default health check port
     probeBindAddr: :8081
+    # -- The default leader election setting
+    enableLeaderElection: false
     # -- How application is synced between the generator and the cluster
     policy: sync
+    # -- Print debug logs
+    debug: false
     # -- Enable dry run mode
     dryRun: false
 
@@ -2248,56 +2252,24 @@ applicationSet:
     # If not set and create is true, a name is generated using the fullname template
     name: ""
 
-  # -- Annotations to be added to ApplicationSet controller Deployment
-  deploymentAnnotations: {}
-
   # -- Annotations for the controller pods
   podAnnotations: {}
 
   # -- Labels for the controller pods
   podLabels: {}
 
-  # -- ApplicationSet controller container-level security context
-  # @default -- See [values.yaml]
-  containerSecurityContext:
-    runAsNonRoot: true
-    readOnlyRootFilesystem: true
-    allowPrivilegeEscalation: false
-    seccompProfile:
-      type: RuntimeDefault
-    capabilities:
-      drop:
-      - ALL
+  # -- Pod Security Context
+  podSecurityContext: {}
+    # fsGroup: 2000
 
-  ## Probes for ApplicationSet controller (optional)
-  ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/
-  readinessProbe:
-    # -- Enable Kubernetes liveness probe for ApplicationSet controller
-    enabled: false
-    # -- Number of seconds after the container has started before [probe] is initiated
-    initialDelaySeconds: 10
-    # -- How often (in seconds) to perform the [probe]
-    periodSeconds: 10
-    # -- Number of seconds after which the [probe] times out
-    timeoutSeconds: 1
-    # -- Minimum consecutive successes for the [probe] to be considered successful after having failed
-    successThreshold: 1
-    # -- Minimum consecutive failures for the [probe] to be considered failed after having succeeded
-    failureThreshold: 3
-
-  livenessProbe:
-    # -- Enable Kubernetes liveness probe for ApplicationSet controller
-    enabled: false
-    # -- Number of seconds after the container has started before [probe] is initiated
-    initialDelaySeconds: 10
-    # -- How often (in seconds) to perform the [probe]
-    periodSeconds: 10
-    # -- Number of seconds after which the [probe] times out
-    timeoutSeconds: 1
-    # -- Minimum consecutive successes for the [probe] to be considered successful after having failed
-    successThreshold: 1
-    # -- Minimum consecutive failures for the [probe] to be considered failed after having succeeded
-    failureThreshold: 3
+  # -- Security Context
+  securityContext: {}
+    # capabilities:
+    #   drop:
+    #   - ALL
+    # readOnlyRootFilesystem: true
+    # runAsNonRoot: true
+    # runAsUser: 1000
 
   # -- Resource limits and requests for the controller pods.
   resources: {}