Add missing bundlePublisher section and extraEnv so settings can be set (#201)

Signed-off-by: Kevin Fox <[email protected]>
Co-authored-by: Faisal Memon <[email protected]>

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

@@ -5,7 +5,7 @@
 {{- include "spire-lib.check-strict-mode" (list . "ca_subject.organization must be set" (eq .Values.ca_subject.organization "Example"))}}
 {{- include "spire-lib.check-strict-mode" (list . "ca_subject.common_name must be set" (eq .Values.ca_subject.common_name "example.org"))}}
 {{- range $type, $tvals := .Values.customPlugins }}
-{{-   if not (has $type (list "keyManager" "nodeAttestor" "upstreamAuthority" "notifier")) }}
+{{-   if not (has $type (list "bundlePublisher" "keyManager" "nodeAttestor" "upstreamAuthority" "notifier")) }}
 {{-     fail (printf "Unknown plugin type specified: %s" $type) }}
 {{-   end }}
 {{-   range $name, $nval := $tvals }}

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

@@ -86,6 +86,9 @@ spec:
           env:
           - name: PATH
             value: "/opt/spire/bin:/bin"
+          {{- with .Values.extraEnv }}
+          {{- . | toYaml | nindent 10 }}
+          {{- end }}
           {{- if ne .Values.dataStore.sql.databaseType "sqlite3" }}
           {{- if .Values.dataStore.sql.externalSecret.enabled }}
           - name: DBPW
@@ -198,6 +201,10 @@ spec:
             {{- if .Values.controllerManager.expandEnv }}
             - --expand-env
             {{- end }}
+          {{- if gt (len .Values.controllerManager.extraEnv) 0 }}
+          env:
+            {{- .Values.controllerManager.extraEnv | toYaml | nindent 12 }}
+          {{- end }}
           ports:
             - name: https
               containerPort: 9443