Merge pull request #16 from eitco/main

0.17.4 release
eitco · Jan 3, 2024 · 5a046a6 · 5a046a6
2 parents fe706b7 + d83a2ca
commit 5a046a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/charts/spire/Chart.yaml b/charts/spire/Chart.yaml
@@ -3,7 +3,7 @@ name: spire
 description: >
   A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager.
 type: application
-version: 0.17.3
+version: 0.17.4
 appVersion: "1.8.5"
 keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc", "spire-controller-manager"]
 home: https://github.com/eitco/helm-charts/tree/main/charts/spire

diff --git a/charts/spire/charts/spire-server/templates/configmap.yaml b/charts/spire/charts/spire-server/templates/configmap.yaml
@@ -81,12 +81,11 @@ plugins:
       plugin_data:
         clusters:
           - {{ include "spire-lib.cluster-name" $root }}:
-            service_account_allow_list: 
-              - {{ include "spire-server.serviceAccountAllowedList" $root | trim }}
+              service_account_allow_list: {{ include "spire-server.serviceAccountAllowedList" $root | trim }}
           {{- range .remoteClusters }}
           - {{ .name }}:
-            service_account_allow_list: 
-              - {{ .serviceAccountAllowList | join ", " }}
+              service_account_allow_list: 
+                - {{ .serviceAccountAllowList | join ", " }}
           {{- end }}
   {{- end }}
   {{- end }}