From 7b409ed91231d6ddda9ac17f4f6389f26bd85cab Mon Sep 17 00:00:00 2001
From: Yann Soubeyrand <github@yann.soubeyrand.eu>
Date: Thu, 17 Oct 2024 23:14:20 +0200
Subject: [PATCH] Fix cert-manager upstream authority when enabling
 recommendations (#476)

Signed-off-by: Yann Soubeyrand <yann.soubeyrand@camptocamp.com>
Co-authored-by: kfox1111 <Kevin.Fox@pnnl.gov>
---
 charts/spire/charts/spire-server/templates/configmap.yaml   | 2 +-
 charts/spire/charts/spire-server/templates/issuer.yaml      | 6 +++---
 .../charts/spire-server/templates/server-resource.yaml      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/spire/charts/spire-server/templates/configmap.yaml b/charts/spire/charts/spire-server/templates/configmap.yaml
index 05eb8e3..f365cec 100644
--- a/charts/spire/charts/spire-server/templates/configmap.yaml
+++ b/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 }}
diff --git a/charts/spire/charts/spire-server/templates/issuer.yaml b/charts/spire/charts/spire-server/templates/issuer.yaml
index 5894543..2029292 100644
--- a/charts/spire/charts/spire-server/templates/issuer.yaml
+++ b/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 }}
diff --git a/charts/spire/charts/spire-server/templates/server-resource.yaml b/charts/spire/charts/spire-server/templates/server-resource.yaml
index 2a16a5c..fd25438 100644
--- a/charts/spire/charts/spire-server/templates/server-resource.yaml
+++ b/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