Enable global config for clusterName, trustDomain, and bundleConfigMap (#156)

2023-04-02 19:28:49 +02:00
parent b54c41aee0
commit 87904164ad
13 changed files with 92 additions and 33 deletions
@@ -10,7 +10,7 @@ data:
    server {
      bind_address = "0.0.0.0"
      bind_port = "8081"
-      trust_domain = {{ .Values.trustDomain | quote }}
+      trust_domain = {{ include "spire-server.trust-domain" . | quote }}
      data_dir = "/run/spire/data"
      log_level = {{ .Values.logLevel | quote }}

@@ -55,7 +55,7 @@ data:
      NodeAttestor "k8s_psat" {
        plugin_data {
          clusters = {
-            {{ $root.Values.clusterName | quote }} = {
+            {{ include "spire-server.cluster-name" $root | quote }} = {
              service_account_allow_list = {{ include "spire-server.serviceAccountAllowedList" $root | trim }}
            }
          }
@@ -73,7 +73,7 @@ data:
      Notifier "k8sbundle" {
        plugin_data {
          namespace = {{ .Values.notifier.k8sbundle.namespace | default $namespace | quote }}
-          config_map = {{ .Values.bundleConfigMap | quote }}
+          config_map = {{ include "spire-server.bundle-configmap" . | quote }}
        }
      }