From c9f69907ac16f5b18289cb930d0bb8892361ad22 Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Tue, 3 Aug 2021 10:55:04 +0200 Subject: [PATCH] Use new domains configuration Signed-off-by: Marco Franssen --- charts/spire/README.md | 5 ++++- charts/spire/templates/oidc-dp-configmap.yaml | 8 +++++--- charts/spire/values.yaml | 6 +++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/charts/spire/README.md b/charts/spire/README.md index 4b684c5..baa39ba 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -63,7 +63,10 @@ Kubernetes: `>=1.19.0-0` | oidc.acme.emailAddress | string | `"letsencrypt@example.org"` | | | 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"` | | diff --git a/charts/spire/templates/oidc-dp-configmap.yaml b/charts/spire/templates/oidc-dp-configmap.yaml index f782e41..32910f2 100644 --- a/charts/spire/templates/oidc-dp-configmap.yaml +++ b/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 }}" diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml index 2fe9e99..06f135b 100644 --- a/charts/spire/values.yaml +++ b/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