Use new domains configuration

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

charts/spire/README.md

@@ -63,7 +63,10 @@ Kubernetes: `>=1.19.0-0`
 | oidc.acme.emailAddress | string | `"[email protected]"` |  |
 | oidc.acme.tosAccepted | bool | `false` |  |
 | oidc.allowInsecureScheme | bool | `false` |  |
-| oidc.domain | string | `"oidc-discovery.example.org"` |  |
+| oidc.domains[0] | string | `"localhost"` |  |
+| oidc.domains[1] | string | `"spire-oidc.spire"` |  |
+| oidc.domains[2] | string | `"spire-oidc.spire.svc.cluster.local"` |  |
+| oidc.domains[3] | string | `"oidc-discovery.example.org"` |  |
 | oidc.enabled | bool | `false` |  |
 | oidc.image.pullPolicy | string | `"IfNotPresent"` |  |
 | oidc.image.repository | string | `"gcr.io/spiffe-io/oidc-discovery-provider"` |  |

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

@@ -7,9 +7,11 @@ metadata:
 data:
   oidc-discovery-provider.conf: |
     log_level = "{{ .Values.oidc.logLevel }}"
-
-    domain = "{{ .Values.oidc.domain }}"
-    insecure_addr = ":{{ .Values.oidc.service.port }}"
+    {{ if gt (len .Values.oidc.domains) 0 }}
+    domains = ["{{- join "\", \"" .Values.oidc.domains }}"]
+    {{ else }}
+    domains = []
+    {{ end }}
     allow_insecure_scheme = {{ .Values.oidc.allowInsecureScheme }}
     acme {
         directory_url = "{{ .Values.oidc.acme.directoryUrl }}"

charts/spire/values.yaml

@@ -44,7 +44,11 @@ oidc:
     annotations: {}
       # external-dns.alpha.kubernetes.io/hostname: oidc-discovery.example.org
 
-  domain: "oidc-discovery.example.org"
+  domains:
+    - localhost
+    - spire-oidc.spire
+    - spire-oidc.spire.svc.cluster.local
+    - oidc-discovery.example.org
 
   allowInsecureScheme: false