Align config across components

Signed-off-by: Marco Franssen <[email protected]>

charts/spire/templates/agent-configmap.yaml

@@ -7,7 +7,7 @@ data:
   agent.conf: |
     agent {
       data_dir = "/run/spire"
-      log_level = "{{ .Values.spire.agent.logLevel }}"
+      log_level = "{{ .Values.agent.config.logLevel }}"
       server_address = "{{ include "spire.fullname" . }}-server"
       server_port = "{{ .Values.server.service.port }}"
       socket_path = "/run/spire/agent-sockets/agent.sock"

charts/spire/templates/oidc-dp-configmap.yaml

@@ -6,13 +6,13 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data:
   oidc-discovery-provider.conf: |
-    log_level = "{{ .Values.oidc.logLevel }}"
+    log_level = "{{ .Values.oidc.config.logLevel }}"
 
     domains = [
       "spire-oidc.{{ .Release.Namespace }}",
       "spire-oidc.{{ .Release.Namespace }}.svc.cluster.local",
-    {{- if gt (len .Values.oidc.domains) 0 }}
-      "{{- join "\",\n      \"" .Values.oidc.domains }}"
+    {{- if gt (len .Values.oidc.config.domains) 0 }}
+      "{{- join "\",\n      \"" .Values.oidc.config.domains }}"
     {{- end }}
     ]
 
@@ -21,10 +21,10 @@ data:
     listen_socket_path = "/run/spire/oidc-sockets/oidc-server.sock"
     {{- else }}
     acme {
-      directory_url = "{{ .Values.oidc.acme.directoryUrl }}"
-      cache_dir = "{{ .Values.oidc.acme.cacheDir }}"
-      tos_accepted = {{ .Values.oidc.acme.tosAccepted }}
-      email = "{{ .Values.oidc.acme.emailAddress }}"
+      directory_url = "{{ .Values.oidc.config.acme.directoryUrl }}"
+      cache_dir = "{{ .Values.oidc.config.acme.cacheDir }}"
+      tos_accepted = {{ .Values.oidc.config.acme.tosAccepted }}
+      email = "{{ .Values.oidc.config.acme.emailAddress }}"
     }
     {{- end }}
 

charts/spire/templates/server-configmap.yaml

@@ -11,19 +11,21 @@ data:
       socket_path = "/run/spire/server-sockets/registration.sock"
       trust_domain = {{ .Values.spire.trustDomain | quote }}
       data_dir = "/run/spire/data"
-      log_level = "{{ .Values.spire.server.logLevel }}"
-      #AWS requires the use of RSA.  EC cryptography is not supported
+      log_level = "{{ .Values.server.config.logLevel }}"
+      # AWS requires the use of RSA.  EC cryptography is not supported
       ca_key_type = "rsa-2048"
 
       {{- if eq (.Values.oidc.enabled | toString) "true" }}
-      jwt_issuer = "{{ .Values.oidc.jwtIssuer }}"
+      jwt_issuer = "{{ .Values.server.config.jwtIssuer }}"
       {{ end }}
       default_x509_svid_ttl = "1h"
       default_jwt_svid_ttl = "1h"
       ca_subject = {
-        country = ["NL"],
-        organization = ["EXAMPLE"],
-        common_name = "",
+        {{- with .Values.server.config.ca_subject }}
+        country = [{{ .country | quote }}],
+        organization = [{{ .organization | quote }}],
+        common_name = {{ .common_name | quote }},
+        {{- end }}
       }
     }