allow for service account names to be defined separately

Signed-off-by: Jeremy Fleitz <jeremy@cosmonic.com>

Author: jfleitz

charts/runtime-operator/templates/_helpers.tpl

@@ -51,16 +51,49 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
-Create the name of the service account to use
+Create the name of the service account to use for the runtime-operator
 */}}
-{{- define "runtime-operator.serviceAccountName" -}}
+{{- define "operator.serviceAccountName" -}}
 {{- if .Values.operator.serviceAccount.create }}
 {{- default (include "runtime-operator.fullname" .) .Values.operator.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.operator.serviceAccount.name }}
 {{- end }}
 {{- end }}
 
+{{/*
+Create the name of the service account to use for the runtime
+*/}}
+{{- define "runtime.serviceAccountName" -}}
+{{- if .Values.runtime.serviceAccount.create }}
+{{- default (printf "%s-runtime" (include "runtime-operator.fullname" .)) .Values.runtime.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.runtime.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use for the runtime gateway
+*/}}
+{{- define "gateway.serviceAccountName" -}}
+{{- if .Values.gateway.serviceAccount.create }}
+{{- default (printf "%s-gateway" (include "runtime-operator.fullname" .)) .Values.gateway.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.gateway.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use for NATS
+*/}}
+{{- define "nats.serviceAccountName" -}}
+{{- if .Values.nats.serviceAccount.create }}
+{{- default (printf "%s-nats" (include "runtime-operator.fullname" .)) .Values.nats.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.nats.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
 {{/*
 Create the imagePullSecrets section for the chart.
 */}}

charts/runtime-operator/templates/gateway/clusterrolebinding.yaml

@@ -13,7 +13,7 @@ roleRef:
   name: {{ include "runtime-operator.fullname" . }}-gateway
 subjects:
   - kind: ServiceAccount
-    name: {{ include "runtime-operator.serviceAccountName" . }}-gateway
+    name: {{ include "gateway.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 {{- end }}
 {{- end }}

charts/runtime-operator/templates/gateway/deployment.yaml

@@ -19,7 +19,8 @@ spec:
         wasmcloud.com/name: runtime-gateway
         {{- include "runtime-operator.labels" . | nindent 8 }}
     spec:
-      serviceAccountName: {{ include "runtime-operator.serviceAccountName" . }}-gateway
+      # change this
+      serviceAccountName: {{ include "gateway.serviceAccountName" . }}
       {{- include "runtime-operator.imagePullSecrets" . | nindent 6 }}
       containers:
         - name: runtime-operator

charts/runtime-operator/templates/gateway/serviceaccount.yaml

@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "runtime-operator.serviceAccountName" . }}-gateway
+  name: {{ include "gateway.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "runtime-operator.labels" . | nindent 4 }}

charts/runtime-operator/templates/nats/deployment.yaml

@@ -26,7 +26,7 @@ spec:
         - name: nats-cert
           secret:
             secretName: {{ .Values.global.certificates.natsCertSecretName }}
-      serviceAccountName: {{ include "runtime-operator.serviceAccountName" . }}-nats
+      serviceAccountName: {{ include "nats.serviceAccountName" . }}
       {{- include "runtime-operator.imagePullSecrets" . | nindent 6 }}
       containers:
         - name: nats

charts/runtime-operator/templates/nats/serviceaccount.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "runtime-operator.serviceAccountName" . }}-nats
+  name: {{ include "nats.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "runtime-operator.labels" . | nindent 4 }}

charts/runtime-operator/templates/operator/clusterrole.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.operator.serviceAccount.create (not .Values.operator.watchNamespaces) -}}
+{{- if and .Values.operator.serviceAccount.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

charts/runtime-operator/templates/operator/clusterrolebinding-metrics.yaml

@@ -12,6 +12,6 @@ roleRef:
   name: {{ include "runtime-operator.fullname" . }}-metrics-auth
 subjects:
   - kind: ServiceAccount
-    name: {{ include "runtime-operator.serviceAccountName" . }}
+    name: {{ include "operator.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 {{- end }}

charts/runtime-operator/templates/operator/clusterrolebinding.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.operator.serviceAccount.create (not .Values.operator.watchNamespaces) -}}
+{{- if and .Values.operator.serviceAccount.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -12,6 +12,6 @@ roleRef:
   name: {{ include "runtime-operator.fullname" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ include "runtime-operator.serviceAccountName" . }}
+    name: {{ include "operator.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 {{- end }}

charts/runtime-operator/templates/operator/deployment.yaml

@@ -22,7 +22,7 @@ spec:
         - name: operator-cert
           secret:
             secretName: {{ .Values.global.certificates.operatorCertSecretName }}
-      serviceAccountName: {{ include "runtime-operator.serviceAccountName" . }}
+      serviceAccountName: {{ include "operator.serviceAccountName" . }}
       {{- include "runtime-operator.imagePullSecrets" . | nindent 6 }}
       containers:
         - name: runtime-operator