Charts CI

```
Updated:
  argo/argo-cd:
    - 5.52.1
  bitnami/airflow:
    - 16.1.11
  bitnami/cassandra:
    - 10.6.9
  bitnami/kafka:
    - 26.6.3
  bitnami/mariadb:
    - 15.0.1
  bitnami/mysql:
    - 9.16.1
  bitnami/postgresql:
    - 13.2.29
  bitnami/redis:
    - 18.6.3
  bitnami/spark:
    - 8.1.8
  bitnami/tomcat:
    - 10.11.11
  bitnami/wordpress:
    - 19.0.5
  bitnami/zookeeper:
    - 12.4.4
  cert-manager/cert-manager:
    - v1.13.3
  clastix/kamaji:
    - 0.14.0
  cockroach-labs/cockroachdb:
    - 11.2.3
  confluent/confluent-for-kubernetes:
    - 0.824.40
  crowdstrike/falcon-sensor:
    - 1.24.1
  datadog/datadog:
    - 3.50.5
  datadog/datadog-operator:
    - 1.4.1
  dell/csi-isilon:
    - 2.9.0
  dell/csi-powermax:
    - 2.9.0
  dell/csi-powerstore:
    - 2.9.0
  dell/csi-unity:
    - 2.9.0
  dell/csi-vxflexos:
    - 2.9.0
  digitalis/vals-operator:
    - 0.7.8
  dynatrace/dynatrace-operator:
    - 0.15.0
  external-secrets/external-secrets:
    - 0.9.11
  f5/nginx-ingress:
    - 1.1.0
  fairwinds/polaris:
    - 5.17.0
  gluu/gluu:
    - 5.0.24
  haproxy/haproxy:
    - 1.35.5
  harbor/harbor:
    - 1.14.0
  hashicorp/consul:
    - 1.3.1
  instana/instana-agent:
    - 1.2.66
  intel/intel-device-plugins-operator:
    - 0.29.0
  intel/intel-device-plugins-qat:
    - 0.29.0
  intel/intel-device-plugins-sgx:
    - 0.29.0
  jenkins/jenkins:
    - 4.11.2
  jfrog/artifactory-ha:
    - 107.71.11
  jfrog/artifactory-jcr:
    - 107.71.11
  kong/kong:
    - 2.33.3
  kubecost/cost-analyzer:
    - 1.108.1
  kuma/kuma:
    - 2.5.1
  linkerd/linkerd-control-plane:
    - 1.16.9
  mongodb/community-operator:
    - 0.9.0
  nats/nats:
    - 1.1.6
  new-relic/nri-bundle:
    - 5.0.58
  nutanix/nutanix-csi-snapshot:
    - 6.3.2
  nutanix/nutanix-csi-storage:
    - 2.6.6
  openebs/openebs:
    - 3.10.0
  percona/psmdb-db:
    - 1.15.1
  percona/pxc-db:
    - 1.13.4
  redpanda/redpanda:
    - 5.7.7
  speedscale/speedscale-operator:
    - 2.0.2
  stackstate/stackstate-k8s-agent:
    - 1.0.66
  sysdig/sysdig:
    - 1.16.24
  traefik/traefik:
    - 26.0.0
  trilio/k8s-triliovault-operator:
    - 4.0.0
  weka/csi-wekafsplugin:
    - 2.3.2
  yugabyte/yugabyte:
    - 2.18.5
  yugabyte/yugaware:
    - 2.18.5
```

charts/argo/argo-cd/Chart.yaml

@@ -1,7 +1,7 @@
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: Upgrade Argo CD to v2.9.2
+      description: DRY cleanup of ServiceAccounts
   artifacthub.io/signKey: |
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
@@ -11,7 +11,7 @@ annotations:
   catalog.cattle.io/kube-version: '>=1.23.0-0'
   catalog.cattle.io/release-name: argo-cd
 apiVersion: v2
-appVersion: v2.9.2
+appVersion: v2.9.3
 dependencies:
 - condition: redis-ha.enabled
   name: redis-ha
@@ -33,4 +33,4 @@ name: argo-cd
 sources:
 - https://github.com/argoproj/argo-helm/tree/main/charts/argo-cd
 - https://github.com/argoproj/argo-cd
-version: 5.51.4
+version: 5.52.1

charts/argo/argo-cd/README.md

@@ -105,6 +105,10 @@ For full list of changes please check ArtifactHub [changelog].
 
 Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version.
 
+### 5.52.0
+Because [Argo CD Extensions] is now deprecated and no further changes will be made, we switched to [Argo CD Extension Installer], adding an Argo CD Extension Installer to init-container in the Argo CD API server.
+If you used old mechanism, please move to new mechanism. For more details, please refer `.Values.server.extensions` in values.yaml.
+
 ### 5.35.0
 This version supports Kubernetes version `>=1.23.0-0`. The current supported version of Kubernetes is v1.24 or later and we align with the Amazon EKS calendar, because many AWS users follow a conservative approach.
 
@@ -115,14 +119,22 @@ The manifests are now using [`tini` as entrypoint][tini], instead of `entrypoint
 This means that the deployment manifests have to be updated after upgrading to Argo CD v2.7, and before upgrading to Argo CD v2.8 later.
 In case the manifests are updated before moving to Argo CD v2.8, the containers will not be able to start.
 
+### 5.26.0
+
+This version adds support for Config Management Plugins using the sidecar model and configured in a ConfigMap named `argocd-cmp-cm`.
+Users will need to migrate from the previous `argocd-cm` ConfigMap method to using the sidecar method before Argo CD v2.8. See the [Argo CD CMP migration guide](https://argo-cd.readthedocs.io/en/stable/operator-manual/config-management-plugins/#migrating-from-argocd-cm-plugins) for more specifics.
+
+To migrate your plugins, you can now set the `configs.cmp.create` to `true` and move your plugins from `configs.cm` to `configs.cmp.plugins`.
+You will also need to configure the sidecar containers under `repoServer.extraContainers` and ensure you are mounting any custom volumes you need from `repoServer.volumes` into here also.
+
 ### 5.24.0
 
-This versions adds additional global parameters for scheduling (`nodeSelector`, `tolerations`, `topologySpreadConstraints`).
+This version adds additional global parameters for scheduling (`nodeSelector`, `tolerations`, `topologySpreadConstraints`).
 Default `global.affinity` rules can be disabled when `none` value is used for the preset.
 
 ### 5.22.0
 
-This versions adds `global.affinity` options that are used as a presets. Override on component level works as before and replaces the default preset completely.
+This version adds `global.affinity` options that are used as a presets. Override on component level works as before and replaces the default preset completely.
 
 ### 5.19.0
 
@@ -710,10 +722,11 @@ NAME: my-release
 | server.env | list | `[]` | Environment variables to pass to Argo CD server |
 | server.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to Argo CD server |
 | server.extensions.containerSecurityContext | object | See [values.yaml] | Server UI extensions container-level security context |
-| server.extensions.enabled | bool | `false` | Enable support for Argo UI extensions |
+| server.extensions.enabled | bool | `false` | Enable support for Argo CD extensions |
+| server.extensions.extensionList | list | `[]` (See [values.yaml]) | Extensions for Argo CD |
 | server.extensions.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for extensions |
-| server.extensions.image.repository | string | `"ghcr.io/argoproj-labs/argocd-extensions"` | Repository to use for extensions image |
-| server.extensions.image.tag | string | `"v0.2.1"` | Tag to use for extensions image |
+| server.extensions.image.repository | string | `"quay.io/argoprojlabs/argocd-extension-installer"` | Repository to use for extension installer image |
+| server.extensions.image.tag | string | `"v0.0.1"` | Tag to use for extension installer image |
 | server.extensions.resources | object | `{}` | Resource limits and requests for the argocd-extensions container |
 | server.extraArgs | list | `[]` | Additional command line arguments to pass to Argo CD server |
 | server.extraContainers | list | `[]` | Additional containers to be added to the server pod |
@@ -1255,3 +1268,5 @@ Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/
 [EKS EoL]: https://endoflife.date/amazon-eks
 [Kubernetes Compatibility Matrix]: https://argo-cd.readthedocs.io/en/stable/operator-manual/installation/#supported-versions
 [Applications in any namespace]: https://argo-cd.readthedocs.io/en/stable/operator-manual/app-any-namespace/#applications-in-any-namespace
+[Argo CD Extensions]: https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice
+[Argo CD Extension Installer]: https://github.com/argoproj-labs/argocd-extension-installer

charts/argo/argo-cd/templates/_helpers.tpl

@@ -11,7 +11,7 @@ to 63 chars and it includes 10 chars of hash and a separating '-'.
 {{/*
 Create the name of the controller service account to use
 */}}
-{{- define "argo-cd.controllerServiceAccountName" -}}
+{{- define "argo-cd.controller.serviceAccountName" -}}
 {{- if .Values.controller.serviceAccount.create -}}
     {{ default (include "argo-cd.controller.fullname" .) .Values.controller.serviceAccount.name }}
 {{- else -}}
@@ -40,7 +40,7 @@ Create Dex server endpoint
 {{/*
 Create the name of the dex service account to use
 */}}
-{{- define "argo-cd.dexServiceAccountName" -}}
+{{- define "argo-cd.dex.serviceAccountName" -}}
 {{- if .Values.dex.serviceAccount.create -}}
     {{ default (include "argo-cd.dex.fullname" .) .Values.dex.serviceAccount.name }}
 {{- else -}}
@@ -78,7 +78,7 @@ Return Redis server endpoint
 {{/*
 Create the name of the redis service account to use
 */}}
-{{- define "argo-cd.redisServiceAccountName" -}}
+{{- define "argo-cd.redis.serviceAccountName" -}}
 {{- if .Values.redis.serviceAccount.create -}}
     {{ default (include "argo-cd.redis.fullname" .) .Values.redis.serviceAccount.name }}
 {{- else -}}
@@ -96,7 +96,7 @@ Create argocd server name and version as used by the chart label.
 {{/*
 Create the name of the Argo CD server service account to use
 */}}
-{{- define "argo-cd.serverServiceAccountName" -}}
+{{- define "argo-cd.server.serviceAccountName" -}}
 {{- if .Values.server.serviceAccount.create -}}
     {{ default (include "argo-cd.server.fullname" .) .Values.server.serviceAccount.name }}
 {{- else -}}
@@ -114,7 +114,7 @@ Create argocd repo-server name and version as used by the chart label.
 {{/*
 Create the name of the repo-server service account to use
 */}}
-{{- define "argo-cd.repoServerServiceAccountName" -}}
+{{- define "argo-cd.repoServer.serviceAccountName" -}}
 {{- if .Values.repoServer.serviceAccount.create -}}
     {{ default (include "argo-cd.repoServer.fullname" .) .Values.repoServer.serviceAccount.name }}
 {{- else -}}
@@ -132,7 +132,7 @@ Create argocd application set name and version as used by the chart label.
 {{/*
 Create the name of the application set service account to use
 */}}
-{{- define "argo-cd.applicationSetServiceAccountName" -}}
+{{- define "argo-cd.applicationSet.serviceAccountName" -}}
 {{- if .Values.applicationSet.serviceAccount.create -}}
     {{ default (include "argo-cd.applicationSet.fullname" .) .Values.applicationSet.serviceAccount.name }}
 {{- else -}}
@@ -150,7 +150,7 @@ Create argocd notifications name and version as used by the chart label.
 {{/*
 Create the name of the notifications service account to use
 */}}
-{{- define "argo-cd.notificationsServiceAccountName" -}}
+{{- define "argo-cd.notifications.serviceAccountName" -}}
 {{- if .Values.notifications.serviceAccount.create -}}
     {{ default (include "argo-cd.notifications.fullname" .) .Values.notifications.serviceAccount.name }}
 {{- else -}}

charts/argo/argo-cd/templates/aggregate-roles.yaml

@@ -14,9 +14,6 @@ rules:
   {{- if .Values.applicationSet.enabled }}
   - applicationsets
   {{- end }}
-  {{- if .Values.server.extensions.enabled }}
-  - argocdextensions
-  {{- end }}
   - appprojects
   verbs:
   - get
@@ -39,9 +36,6 @@ rules:
   {{- if .Values.applicationSet.enabled }}
   - applicationsets
   {{- end }}
-  {{- if .Values.server.extensions.enabled }}
-  - argocdextensions
-  {{- end }}
   - appprojects
   verbs:
   - create
@@ -69,9 +63,6 @@ rules:
   {{- if .Values.applicationSet.enabled }}
   - applicationsets
   {{- end }}
-  {{- if .Values.server.extensions.enabled }}
-  - argocdextensions
-  {{- end }}
   - appprojects
   verbs:
   - create

charts/argo/argo-cd/templates/argocd-application-controller/clusterrolebinding.yaml

@@ -12,6 +12,6 @@ roleRef:
   name: {{ include "argo-cd.controller.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: {{ include "argo-cd.controllerServiceAccountName" . }}
+  name: {{ include "argo-cd.controller.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 {{- end }}

charts/argo/argo-cd/templates/argocd-application-controller/rolebinding.yaml

@@ -1,15 +1,15 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ template "argo-cd.controller.fullname" . }}
+  name: {{ include "argo-cd.controller.fullname" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ template "argo-cd.controller.fullname" . }}
+  name: {{ include "argo-cd.controller.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: {{ template "argo-cd.controllerServiceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  name: {{ include "argo-cd.controller.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}

charts/argo/argo-cd/templates/argocd-application-controller/serviceaccount.yaml

@@ -3,17 +3,17 @@ apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.controller.serviceAccount.automountServiceAccountToken }}
 metadata:
-  name: {{ template "argo-cd.controllerServiceAccountName" . }}
+  name: {{ include "argo-cd.controller.serviceAccountName" . }}
   namespace: {{ .Release.Namespace | quote }}
-{{- if .Values.controller.serviceAccount.annotations }}
+  {{- with .Values.controller.serviceAccount.annotations }}
   annotations:
-  {{- range $key, $value := .Values.controller.serviceAccount.annotations }}
+    {{- range $key, $value := . }}
     {{ $key }}: {{ $value | quote }}
+    {{- end }}
   {{- end }}
-{{- end }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
-  {{- range $key, $value := .Values.controller.serviceAccount.labels }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
+    {{- with .Values.controller.serviceAccount.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 {{- end }}

charts/argo/argo-cd/templates/argocd-application-controller/statefulset.yaml

@@ -55,7 +55,7 @@ spec:
       {{- if .Values.controller.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
       {{- end }}
-      serviceAccountName: {{ include "argo-cd.controllerServiceAccountName" . }}
+      serviceAccountName: {{ include "argo-cd.controller.serviceAccountName" . }}
       containers:
       - args:
         - /usr/local/bin/argocd-application-controller

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

@@ -55,7 +55,7 @@ spec:
       {{- if .Values.applicationSet.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ .Values.applicationSet.terminationGracePeriodSeconds }}
       {{- end }}
-      serviceAccountName: {{ include "argo-cd.applicationSetServiceAccountName" . }}
+      serviceAccountName: {{ include "argo-cd.applicationSet.serviceAccountName" . }}
       containers:
         - name: {{ .Values.applicationSet.name }}
           image: {{ default .Values.global.image.repository .Values.applicationSet.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.applicationSet.image.tag }}

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

@@ -2,16 +2,16 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ template "argo-cd.applicationSet.fullname" . }}
+  name: {{ include "argo-cd.applicationSet.fullname" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.applicationSet.name "name" .Values.applicationSet.name) | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ template "argo-cd.applicationSet.fullname" . }}
+  name: {{ include "argo-cd.applicationSet.fullname" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ template "argo-cd.applicationSetServiceAccountName" . }}
+    name: {{ include "argo-cd.applicationSet.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 {{- end }}

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

@@ -3,17 +3,17 @@ apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.applicationSet.serviceAccount.automountServiceAccountToken }}
 metadata:
-  name: {{ template "argo-cd.applicationSetServiceAccountName" . }}
+  name: {{ include "argo-cd.applicationSet.serviceAccountName" . }}
   namespace: {{ .Release.Namespace | quote }}
-{{- if .Values.applicationSet.serviceAccount.annotations }}
+  {{- with .Values.applicationSet.serviceAccount.annotations }}
   annotations:
-  {{- range $key, $value := .Values.applicationSet.serviceAccount.annotations }}
+    {{- range $key, $value := . }}
     {{ $key }}: {{ $value | quote }}
+    {{- end }}
   {{- end }}
-{{- end }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.applicationSet.name "name" .Values.applicationSet.name) | nindent 4 }}
-  {{- range $key, $value := .Values.applicationSet.serviceAccount.labels }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
+    {{- with .Values.applicationSet.serviceAccount.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 {{- end }}

charts/argo/argo-cd/templates/argocd-notifications/clusterrolebinding.yaml

@@ -11,6 +11,6 @@ roleRef:
   name: {{ include "argo-cd.notifications.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: {{ include "argo-cd.notificationsServiceAccountName" . }}
+  name: {{ include "argo-cd.notifications.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 {{- end }}

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

@@ -54,7 +54,7 @@ spec:
       {{- if .Values.notifications.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ .Values.notifications.terminationGracePeriodSeconds }}
       {{- end }}
-      serviceAccountName: {{ include "argo-cd.notificationsServiceAccountName" . }}
+      serviceAccountName: {{ include "argo-cd.notifications.serviceAccountName" . }}
       containers:
         - name: {{ .Values.notifications.name }}
           image: {{ default .Values.global.image.repository .Values.notifications.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.notifications.image.tag }}

charts/argo/argo-cd/templates/argocd-notifications/rolebinding.yaml

@@ -2,16 +2,16 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ template "argo-cd.notifications.fullname" . }}
+  name: {{ include "argo-cd.notifications.fullname" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" .Values.notifications.name) | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ template "argo-cd.notifications.fullname" . }}
+  name: {{ include "argo-cd.notifications.fullname" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ template "argo-cd.notificationsServiceAccountName" . }}
+    name: {{ include "argo-cd.notifications.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 {{- end }}

charts/argo/argo-cd/templates/argocd-notifications/serviceaccount.yaml

@@ -3,17 +3,17 @@ apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.notifications.serviceAccount.automountServiceAccountToken }}
 metadata:
-  name: {{ template "argo-cd.notificationsServiceAccountName" . }}
+  name: {{ include "argo-cd.notifications.serviceAccountName" . }}
   namespace: {{ .Release.Namespace | quote }}
-{{- if .Values.notifications.serviceAccount.annotations }}
+  {{- with .Values.notifications.serviceAccount.annotations }}
   annotations:
-  {{- range $key, $value := .Values.notifications.serviceAccount.annotations }}
+    {{- range $key, $value := . }}
     {{ $key }}: {{ $value | quote }}
+    {{- end }}
   {{- end }}
-{{- end }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" .Values.notifications.name) | nindent 4 }}
-  {{- range $key, $value := .Values.notifications.serviceAccount.labels }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
+    {{- with .Values.notifications.serviceAccount.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 {{- end }}

charts/argo/argo-cd/templates/argocd-repo-server/clusterrolebinding.yaml

@@ -12,6 +12,6 @@ roleRef:
   name: {{ include "argo-cd.repoServer.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: {{ include "argo-cd.repoServerServiceAccountName" . }}
+  name: {{ include "argo-cd.repoServer.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 {{- end }}

charts/argo/argo-cd/templates/argocd-repo-server/deployment.yaml

@@ -65,7 +65,7 @@ spec:
       {{- if .Values.repoServer.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ .Values.repoServer.terminationGracePeriodSeconds }}
       {{- end }}
-      serviceAccountName: {{ include "argo-cd.repoServerServiceAccountName" . }}
+      serviceAccountName: {{ include "argo-cd.repoServer.serviceAccountName" . }}
       containers:
       - name: {{ .Values.repoServer.name }}
         image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }}

charts/argo/argo-cd/templates/argocd-repo-server/rolebinding.yaml

@@ -2,16 +2,16 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ template "argo-cd.repoServer.fullname" . }}
+  name: {{ include "argo-cd.repoServer.fullname" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ template "argo-cd.repoServer.fullname" . }}
+  name: {{ include "argo-cd.repoServer.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: {{ template "argo-cd.repoServerServiceAccountName" . }}
+  name: {{ include "argo-cd.repoServer.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
-{{- end }}
+{{- end }}