fix(argo-workflows): use template for all resource names (#759)

CODEOWNERS

@@ -4,7 +4,7 @@
 /charts/ @mkilchhofer
 
 # Argo Workflows
-/charts/argo @stefansedich @paguos @vladlosev @yann-soubeyrand @oliverbaehler
+/charts/argo-workflows/ @stefansedich @paguos @vladlosev @yann-soubeyrand @oliverbaehler
 
 # Argo CD
 /charts/argo-cd @seanson @davidkarlsen @mr-sour @yann-soubeyrand @oliverbaehler

charts/argo-workflows/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.1.4
+version: 0.1.5
 appVersion: "v3.0.2"
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm

charts/argo-workflows/templates/NOTES.txt

@@ -1,6 +1,6 @@
 1. Get Argo Server external IP/domain by running:
 
-kubectl --namespace {{ .Release.Namespace }} get services -o wide | grep {{ .Release.Name }}-{{ .Values.server.name }}
+kubectl --namespace {{ .Release.Namespace }} get services -o wide | grep {{ template "argo-workflows.server.fullname" . }}
 
 2. Submit the hello-world workflow by running:
 

charts/argo-workflows/templates/_helpers.tpl

@@ -65,7 +65,7 @@ Create the name of the server service account to use
 */}}
 {{- define "argo-workflows.serverServiceAccountName" -}}
 {{- if .Values.server.serviceAccount.create -}}
-    {{ default (include "argo-workflows.fullname" .) .Values.server.serviceAccount.name }}
+    {{ default (include "argo-workflows.server.fullname" .) .Values.server.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.server.serviceAccount.name }}
 {{- end -}}
@@ -76,7 +76,7 @@ Create the name of the controller service account to use
 */}}
 {{- define "argo-workflows.controllerServiceAccountName" -}}
 {{- if .Values.controller.serviceAccount.create -}}
-    {{ default (include "argo-workflows.fullname" .) .Values.controller.serviceAccount.name }}
+    {{ default (include "argo-workflows.controller.fullname" .) .Values.controller.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.controller.serviceAccount.name }}
 {{- end -}}

charts/argo-workflows/templates/controller/workflow-aggregate-roles.yaml

@@ -2,10 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  annotations:
-    helm.sh/hook: pre-install
-    helm.sh/hook-delete-policy: before-hook-creation
-  name: argo-workflows-aggregate-to-view
+  name: {{ template "argo-workflows.fullname" . }}-view
   labels:
     rbac.authorization.k8s.io/aggregate-to-view: "true"
 rules:
@@ -30,10 +27,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  annotations:
-    helm.sh/hook: pre-install
-    helm.sh/hook-delete-policy: before-hook-creation
-  name: argo-workflows-aggregate-to-edit
+  name: {{ template "argo-workflows.fullname" . }}-edit
   labels:
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
 rules:
@@ -63,10 +57,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  annotations:
-    helm.sh/hook: pre-install
-    helm.sh/hook-delete-policy: before-hook-creation
-  name: argo-workflows-aggregate-to-admin
+  name: {{ template "argo-workflows.fullname" . }}-admin
   labels:
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
 rules:

charts/argo-workflows/templates/controller/workflow-controller-cluster-roles.yaml

@@ -135,7 +135,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template
+  name: {{ template "argo-workflows.controller.fullname" . }}-cluster-template
 rules:
 - apiGroups:
   - argoproj.io

charts/argo-workflows/values.yaml

@@ -93,7 +93,7 @@ controller:
     additionalLabels: {}
   serviceAccount:
     create: true
-    name: argo
+    name: ""
     # Annotations applied to created service account
     annotations: {}
   name: workflow-controller
@@ -190,7 +190,7 @@ server:
   # servicePortName: http
   serviceAccount:
     create: true
-    name: argo-server
+    name: ""
     annotations: {}
   # Annotations to be applied to the UI Service
   serviceAnnotations: {}