fix(argo-cd): Add missing options for mounting service account tokens (#1787)

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
Co-authored-by: Jason Meridth <jmeridth@gmail.com>

charts/argo-cd/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: v2.5.7
 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.19.1
+version: 5.19.2
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -23,5 +23,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: Container port configuration now properly sets the listening port"
+    - "[Fixed]: Added missing options for automounting service tokens for applicationset and notifications controllers"
-    - "[Changed]: Container ports consolidated from various places to new containerPorts sections"

charts/argo-cd/README.md

@@ -1026,10 +1026,11 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
 | applicationSet.service.labels | object | `{}` | ApplicationSet service labels |
 | applicationSet.service.port | int | `7000` | ApplicationSet service port |
 | applicationSet.service.portName | string | `"webhook"` | ApplicationSet service port name |
-| applicationSet.serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
+| applicationSet.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
-| applicationSet.serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
+| applicationSet.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
+| applicationSet.serviceAccount.create | bool | `true` | Create ApplicationSet controller service account |
 | applicationSet.serviceAccount.labels | object | `{}` | Labels applied to created service account |
-| applicationSet.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
+| applicationSet.serviceAccount.name | string | `"argocd-applicationset-controller"` | ApplicationSet controller service account name |
 | applicationSet.tolerations | list | `[]` | [Tolerations] for use with node taints |
 | applicationSet.webhook.ingress.annotations | object | `{}` | Additional ingress annotations |
 | applicationSet.webhook.ingress.enabled | bool | `false` | Enable an ingress resource for Webhooks |
@@ -1116,9 +1117,10 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
 | notifications.secret.create | bool | `true` | Whether helm chart creates notifications controller secret |
 | notifications.secret.items | object | `{}` | Generic key:value pairs to be inserted into the secret |
 | notifications.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
-| notifications.serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
+| notifications.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
+| notifications.serviceAccount.create | bool | `true` | Create notifications controller service account |
 | notifications.serviceAccount.labels | object | `{}` | Labels applied to created service account |
-| notifications.serviceAccount.name | string | `"argocd-notifications-controller"` | The name of the service account to use. |
+| notifications.serviceAccount.name | string | `"argocd-notifications-controller"` | Notification controller service account name |
 | notifications.subscriptions | list | `[]` | Contains centrally managed global application subscriptions |
 | notifications.templates | object | `{}` | The notification template is used to generate the notification content |
 | notifications.tolerations | list | `[]` | [Tolerations] for use with node taints |

charts/argo-cd/values.yaml

@@ -2205,15 +2205,16 @@ applicationSet:
     portName: webhook
 
   serviceAccount:
-    # -- Specifies whether a service account should be created
+    # -- Create ApplicationSet controller service account
     create: true
-    # -- Annotations to add to the service account
+    # -- ApplicationSet controller service account name
+    name: argocd-applicationset-controller
+    # -- Annotations applied to created service account
     annotations: {}
     # -- Labels applied to created service account
     labels: {}
-    # -- The name of the service account to use.
+    # -- Automount API credentials for the Service Account
-    # If not set and create is true, a name is generated using the fullname template
+    automountServiceAccountToken: true
-    name: ""
 
   # -- Annotations to be added to ApplicationSet controller Deployment
   deploymentAnnotations: {}
@@ -2537,18 +2538,17 @@ notifications:
   priorityClassName: ""
 
   serviceAccount:
-    # -- Specifies whether a service account should be created
+    # -- Create notifications controller service account
     create: true
-
+    # -- Notification controller service account name
-    # -- The name of the service account to use.
-    ## If not set and create is true, a name is generated using the fullname template
     name: argocd-notifications-controller
-
     # -- Annotations applied to created service account
     annotations: {}
-
     # -- Labels applied to created service account
     labels: {}
+    # -- Automount API credentials for the Service Account
+    automountServiceAccountToken: true
+
   cm:
     # -- Whether helm chart creates notifications controller config map
     create: true