Specifies namespace for service accounts unconditionally.

charts/argo/templates/server-crb.yaml

@@ -16,9 +16,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ .Values.server.serviceAccount }}
-  {{- if not .Values.singleNamespace }}
   namespace: {{ .Release.Namespace }}
-  {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

charts/argo/templates/workflow-controller-crb.yaml

@@ -13,9 +13,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ .Values.controller.serviceAccount }}
-    {{- if not .Values.singleNamespace }}
     namespace: {{ .Release.Namespace }}
-    {{- end }}
 {{- if .Values.controller.workflowNamespaces }}
 {{- $uiServiceAccount := .Values.controller.serviceAccount }}
 {{- $namespace := .Release.Namespace }}