From 2fcc105f3223f9c058d4c92a73fbbe7893feef7b Mon Sep 17 00:00:00 2001
From: kfox1111 <Kevin.Fox@pnnl.gov>
Date: Wed, 27 Mar 2024 09:35:46 -0700
Subject: [PATCH] Fix kubeCconfig edge case (#306)

When installing with nodeAttestor.k8sPsat.enabled=false and no
kubeConfig yet or with .Values.notifier.k8sbundle.enabled=false and no
kubeConfig yet, it produces a bad config file.

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
---
 .../charts/spire-server/templates/configmap.yaml     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/spire/charts/spire-server/templates/configmap.yaml b/charts/spire/charts/spire-server/templates/configmap.yaml
index 8ee8d5e..35e32a6 100644
--- a/charts/spire/charts/spire-server/templates/configmap.yaml
+++ b/charts/spire/charts/spire-server/templates/configmap.yaml
@@ -97,7 +97,8 @@ plugins:
 
   {{- if or .Values.nodeAttestor.k8sPsat.enabled .Values.nodeAttestor.externalK8sPsat.enabled .Values.nodeAttestor.joinToken.enabled .Values.nodeAttestor.tpmDirect.enabled }}
   NodeAttestor:
-  {{- if or (eq (.Values.nodeAttestor.k8sPsat.enabled | toString) "true") (eq (.Values.nodeAttestor.externalK8sPsat.enabled | toString) "true") }}
+  {{- $clusters := default .Values.kubeConfigs .Values.nodeAttestor.externalK8sPsat.clusters }}
+  {{- if or (eq (.Values.nodeAttestor.k8sPsat.enabled | toString) "true") (and (eq (.Values.nodeAttestor.externalK8sPsat.enabled | toString) "true") (gt (len $clusters) 0)) }}
     k8s_psat:
       plugin_data:
         clusters:
@@ -113,7 +114,6 @@ plugins:
           {{- end }}
           {{- end }}
           {{- if eq (.Values.nodeAttestor.externalK8sPsat.enabled | toString) "true" }}
-          {{- $clusters := default .Values.kubeConfigs .Values.nodeAttestor.externalK8sPsat.clusters }}
           {{- $clusterDefaults := .Values.nodeAttestor.externalK8sPsat.defaults }}
           {{- range $name, $_ := $clusters }}
           {{- $clusterSettings := dict }}
@@ -205,7 +205,8 @@ plugins:
 {{- fail (printf "You have to enable exactly one Key Manager. There are %d enabled." $keyManagerUsed) }}
 {{- end }}
 
-  {{- if or .Values.notifier.k8sbundle.enabled .Values.notifier.externalK8sBundle.enabled }}
+  {{- $externalK8sBundleClusters := default .Values.kubeConfigs .Values.notifier.externalK8sBundle.clusters }}
+  {{- if or .Values.notifier.k8sbundle.enabled (and .Values.notifier.externalK8sBundle.enabled (ne (len $externalK8sBundleClusters) 0)) }}
   Notifier:
     k8sbundle:
       plugin_data:
@@ -213,12 +214,11 @@ plugins:
         namespace: {{ include "spire-server.bundle-namespace" . | quote }}
         config_map: {{ include "spire-lib.bundle-configmap" . | quote }}
         {{- end }}
-        {{- $clusters := default .Values.kubeConfigs .Values.notifier.externalK8sBundle.clusters }}
-        {{- if and (eq (.Values.notifier.externalK8sBundle.enabled | toString) "true") (ne (len $clusters) 0) }}
+        {{- if and (eq (.Values.notifier.externalK8sBundle.enabled | toString) "true") (ne (len $externalK8sBundleClusters) 0) }}
         clusters:
           - "":
           {{- $clusterDefaults := .Values.notifier.externalK8sBundle.defaults }}
-          {{- range $name, $_ := $clusters }}
+          {{- range $name, $_ := $externalK8sBundleClusters }}
             {{- $clusterSettings := dict }}
             {{- if hasKey $root.Values.notifier.externalK8sBundle.clusters $name }}
             {{- $clusterSettings = index $root.Values.notifier.externalK8sBundle.clusters $name }}