Fix cert-manager upstream authority when enabling recommendations (#476)

Signed-off-by: Yann Soubeyrand <[email protected]>
Co-authored-by: kfox1111 <[email protected]>

charts/spire/charts/spire-server/templates/configmap.yaml

@@ -334,7 +334,7 @@ plugins:
         issuer_name: {{ default (printf "%s-ca" (include "spire-server.fullname" $root)) .issuerName }}
         issuer_kind: {{ .issuerKind | quote }}
         issuer_group: {{ .issuerGroup | quote }}
-        namespace: {{ default $root.Release.Namespace .namespace | quote }}
+        namespace: {{ default (include "spire-server.namespace" $) .namespace | quote }}
         {{- if ne .kubeConfigFile "" }}
         kube_config_file: {{ .kubeConfigFile | quote }}
         {{- end }}

charts/spire/charts/spire-server/templates/issuer.yaml

@@ -21,14 +21,14 @@ metadata:
   namespace: {{ include "spire-server.namespace" $ }}
 spec:
   isCA: true
-  commonName: {{ $.Values.caSubject.commonName }}
+  commonName: {{ include "spire-server.ca-subject-common-name" $ | quote }}
   secretName: {{ include "spire-server.fullname" $ }}-ca-keys
   duration: {{ $.Values.upstreamAuthority.certManager.ca.duration }}
   subject:
     countries:
-      - {{ $.Values.caSubject.country }}
+      - {{ include "spire-server.ca-subject-country" $ | quote }}
     organizations:
-      - {{ $.Values.caSubject.organization }}
+      - {{ include "spire-server.ca-subject-organization" $ | quote }}
   privateKey:
     algorithm: {{ $.Values.upstreamAuthority.certManager.ca.privateKey.algorithm }}
     size: {{ $.Values.upstreamAuthority.certManager.ca.privateKey.size }}

charts/spire/charts/spire-server/templates/server-resource.yaml

@@ -168,7 +168,7 @@ spec:
           args:
             - wait
             - --namespace
-            - {{ .Release.Namespace }}
+            - {{ include "spire-server.namespace" $ }}
             - --timeout=3m
             - --for=condition=ready
             - issuer