Align config across components

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

charts/spire/values.yaml

@@ -75,6 +75,43 @@ server:
     # runAsNonRoot: true
     # runAsUser: 1000
 
+  config:
+    logLevel: info
+    jwtIssuer: oidc-discovery.example.org
+
+    ca_subject:
+      country: NL
+      organization: Example
+      common_name: example.org
+
+agent:
+  image:
+    # registry: gcr.io
+    # repository: spiffe-io/spire-agent
+    registry: ghcr.io
+    repository: spiffe/spire-agent
+    pullPolicy: IfNotPresent
+    # Overrides the image tag whose default is the chart appVersion.
+    version: ""
+
+  nodeSelector:
+    kubernetes.io/arch: amd64
+
+  resources: {}
+    # We usually recommend not to specify default resources and to leave this as a conscious
+    # choice for the user. This also increases chances charts run on environments with little
+    # resources, such as Minikube. If you do want to specify resources, uncomment the following
+    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+    # requests:
+    #   cpu: 50m
+    #   memory: 64Mi
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+
+  config:
+    logLevel: info
+
 csiDriver:
   image:
     registry: ghcr.io
@@ -138,20 +175,12 @@ oidc:
     #   cpu: 100m
     #   memory: 64Mi
 
-  logLevel: INFO
-
   service:
     type: NodePort
     port: 80
     annotations: {}
       # external-dns.alpha.kubernetes.io/hostname: oidc-discovery.example.org
 
-  jwtIssuer: oidc-discovery.example.org
-
-  domains:
-    - localhost
-    - oidc-discovery.example.org
-
   podSecurityContext: {}
     # fsGroup: 2000
 
@@ -178,36 +207,17 @@ oidc:
         pullPolicy: IfNotPresent
         version: 1.23
 
-  acme:
-    tosAccepted: false
-    cacheDir: /run/spire
-    directoryUrl: https://acme-v02.api.letsencrypt.org/directory
-    emailAddress: [email protected]
+  config:
+    logLevel: info
+    domains:
+      - localhost
+      - oidc-discovery.example.org
 
-agent:
-  image:
-    # registry: gcr.io
-    # repository: spiffe-io/spire-agent
-    registry: ghcr.io
-    repository: spiffe/spire-agent
-    pullPolicy: IfNotPresent
-    # Overrides the image tag whose default is the chart appVersion.
-    version: ""
-
-  nodeSelector:
-    kubernetes.io/arch: amd64
-
-  resources: {}
-    # We usually recommend not to specify default resources and to leave this as a conscious
-    # choice for the user. This also increases chances charts run on environments with little
-    # resources, such as Minikube. If you do want to specify resources, uncomment the following
-    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-    # requests:
-    #   cpu: 50m
-    #   memory: 64Mi
-    # limits:
-    #   cpu: 100m
-    #   memory: 128Mi
+    acme:
+      tosAccepted: false
+      cacheDir: /run/spire
+      directoryUrl: https://acme-v02.api.letsencrypt.org/directory
+      emailAddress: [email protected]
 
 imagePullSecrets: []
   # - name: my-docker-registry
@@ -236,7 +246,3 @@ autoscaling:
 spire:
   clusterName: "example-cluster"
   trustDomain: "example.org"
-  agent:
-    logLevel: info
-  server:
-    logLevel: info