chore(argo-cd): Remove duplicate ApplicationSet features (argoproj#1598)

Signed-off-by: Petr Drastil <[email protected]>

Author: pdrastil

charts/argo-cd/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: v2.5.3
 kubeVersion: ">=1.22.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.15.1
+version: 5.15.2
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -23,6 +23,7 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: TLS secret name so Dex correctly generates the checksum for argocd-dex-server-tls."
-    - "[Fixed]: Standardise the naming convention of the TLS secret manifests."
-    - "[Added]: Add checksum to Repo-Server for the argocd-repo-server-tls secret."
+    - "[Changed]: ApplicationSet now automatically detects leader election"
+    - "[Changed]: Simplified ApplicationSet RBAC rules"
+    - "[Removed]: Configuration option applicationset.args.debug"
+    - "[Removed]: Configuration option applicationset.args.enableLeaderElection"

charts/argo-cd/README.md

@@ -950,9 +950,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | applicationSet.affinity | object | `{}` | Assign custom [affinity] rules |
-| applicationSet.args.debug | bool | `false` | Print debug logs |
 | applicationSet.args.dryRun | bool | `false` | Enable dry run mode |
-| applicationSet.args.enableLeaderElection | bool | `false` | The default leader election setting |
 | applicationSet.args.metricsAddr | string | `":8080"` | The default metric address |
 | applicationSet.args.policy | string | `"sync"` | How application is synced between the generator and the cluster |
 | applicationSet.args.probeBindAddr | string | `":8081"` | The default health check port |

charts/argo-cd/templates/NOTES.txt

@@ -58,6 +58,12 @@ REMOVED option controller.service - Use controller.metrics
 {{- if .Values.repoServer.copyutil }}
 REMOVED option repoSever.copyutil.resources - Use repoServer.resources
 {{- end }}
+{{- if .Values.applicationSet.args.debug }}
+REMOVED option applicationSet.args.debug - Use applicationSet.logLevel: debug
+{{- end }}
+{{- if .Values.applicationSet.args.enableLeaderElection }}
+REMOVED option applicationSet.args.enableLeaderElection - Value determined based on replicas
+{{- end }}
 
 In order to access the server UI you have the following options:
 

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

@@ -41,19 +41,16 @@ spec:
           command:
             - entrypoint.sh
             - argocd-applicationset-controller
-            - --logformat
-            - {{ default .Values.global.logging.format .Values.applicationSet.logFormat }}
-            - --loglevel
-            - {{ default .Values.global.logging.level .Values.applicationSet.logLevel }}
+            - --argocd-repo-server={{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
+            - --enable-leader-election={{ gt ( .Values.applicationSet.replicaCount | int64) 1 }}
             - --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 }}

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

@@ -47,31 +47,32 @@ rules:
   - apiGroups:
     - ""
     resources:
-    - secrets
     - configmaps
     verbs:
+    - create
+    - update
+    - delete
     - get
     - list
+    - patch
     - watch
   - apiGroups:
-    - apps
-    - extensions
+    - ""
     resources:
-    - deployments
+    - secrets
     verbs:
     - get
     - list
     - watch
-  # Leader election
   - apiGroups:
-    - ""
+    - apps
+    - extensions
     resources:
-    - configmaps
+    - deployments
     verbs:
-    - create
-    - update
-    - delete
-    - patch
+    - get
+    - list
+    - watch
   - apiGroups:
     - coordination.k8s.io
     resources:

charts/argo-cd/values.yaml

@@ -2153,12 +2153,8 @@ 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