Handle no service account for repo-server

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

@@ -105,7 +105,9 @@ spec:
       affinity:
 {{- toYaml .Values.repoServer.affinity | nindent 8 }}
     {{- end }}
+    {{- if .Values.repoServer.serviceAccount.create }}
       serviceAccountName: {{ template "argo-cd.repoServerServiceAccountName" . }}
+    {{- end }}
       volumes:
       {{- if .Values.repoServer.volumes }}
 {{- toYaml .Values.repoServer.volumes | nindent 8}}

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

@@ -1,3 +1,4 @@
+{{- if .Values.repoServer.serviceAccount.create }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -13,3 +14,4 @@ rules:
 {{- if .Values.repoServer.rbac }}
 {{toYaml .Values.repoServer.rbac }}
 {{- end }}
+{{- end }}

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

@@ -1,3 +1,4 @@
+{{- if .Values.repoServer.serviceAccount.create }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -17,3 +18,4 @@ subjects:
 - kind: ServiceAccount
   name: {{ template "argo-cd.repoServerServiceAccountName" . }}
   namespace: {{ .Release.Namespace }}
+{{- end }}

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

@@ -1,3 +1,4 @@
+{{- if .Values.repoServer.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,3 +10,4 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.repoServer.name }}
+{{- end }}

charts/argo-cd/values.yaml

@@ -478,13 +478,15 @@ repoServer:
     #   namespace: monitoring
     #   additionalLabels: {}
 
+  ## Repo server service account
+  ## If create is set to true, make sure to uncomment the name and update the rbac section below
   serviceAccount:
-    create: true
+    create: false
-    name: argocd-repo-server
+  #  name: argocd-repo-server
 
   ## Repo server rbac rules
-  #rbac:   
+ # rbac:    
-  #- apiGroups:
+ #   - apiGroups:
  #     - argoproj.io
  #     resources:
  #     - applications