Add recommendation for namespaceLayout (#127)

Co-authored-by: Marco Franssen <[email protected]>

charts/spire/charts/spire-agent/templates/_helpers.tpl

@@ -29,6 +29,12 @@ Allow the release namespace to be overridden for multi-namespace deployments in
 {{- define "spire-agent.namespace" -}}
   {{- if .Values.namespaceOverride -}}
     {{- .Values.namespaceOverride -}}
+  {{- else if and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "namespaceLayout" true .Values.global) }}
+    {{- if ne (len (dig "spire" "namespaces" "system" "name" "" .Values.global)) 0 }}
+      {{- .Values.global.spire.namespaces.system.name }}
+    {{- else }}
+      {{- printf "spire-system" }}
+    {{- end }}
   {{- else -}}
     {{- .Release.Namespace -}}
   {{- end -}}
@@ -37,6 +43,12 @@ Allow the release namespace to be overridden for multi-namespace deployments in
 {{- define "spire-agent.server.namespace" -}}
   {{- if .Values.server.namespaceOverride -}}
     {{- .Values.server.namespaceOverride -}}
+  {{- else if and (dig "spire" "recommendations" "enabled" false .Values.global) (dig "spire" "recommendations" "namespaceLayout" true .Values.global) }}
+    {{- if ne (len (dig "spire" "namespaces" "server" "name" "" .Values.global)) 0 }}
+      {{- .Values.global.spire.namespaces.server.name }}
+    {{- else }}
+      {{- printf "spire-server" }}
+    {{- end }}
   {{- else -}}
     {{- .Release.Namespace -}}
   {{- end -}}
@@ -83,11 +95,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 Create the name of the service account to use
 */}}
 {{- define "spire-agent.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "spire-agent.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
+{{- default (printf "%s-agent" .Release.Name) .Values.serviceAccount.name }}
 {{- end }}
 
 {{- define "spire-agent.server-address" }}