From 1c54ce82bb3054287ad882887520a444ec6b585e Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Tue, 3 Aug 2021 11:29:04 +0200 Subject: [PATCH] Add jwtIssuer configuration Signed-off-by: Marco Franssen --- charts/spire/README.md | 1 + charts/spire/templates/server-configmap.yaml | 2 +- charts/spire/values.yaml | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/spire/README.md b/charts/spire/README.md index baa39ba..6e2c002 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -71,6 +71,7 @@ Kubernetes: `>=1.19.0-0` | oidc.image.pullPolicy | string | `"IfNotPresent"` | | | oidc.image.repository | string | `"gcr.io/spiffe-io/oidc-discovery-provider"` | | | oidc.image.tag | string | `""` | | +| oidc.jwtIssuer | string | `"oidc-discovery.example.org"` | | | oidc.logLevel | string | `"INFO"` | | | oidc.service.annotations | object | `{}` | | | oidc.service.port | int | `80` | | diff --git a/charts/spire/templates/server-configmap.yaml b/charts/spire/templates/server-configmap.yaml index 581e98e..84d5bcd 100644 --- a/charts/spire/templates/server-configmap.yaml +++ b/charts/spire/templates/server-configmap.yaml @@ -16,7 +16,7 @@ data: ca_key_type = "rsa-2048" {{- if eq (.Values.oidc.enabled | toString) "true" }} - jwt_issuer = "{{ .Values.oidc.domain }}" + jwt_issuer = "{{ .Values.oidc.jwtIssuer }}" {{ end }} default_svid_ttl = "1h" ca_subject = { diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml index 06f135b..c49ccd9 100644 --- a/charts/spire/values.yaml +++ b/charts/spire/values.yaml @@ -44,6 +44,8 @@ oidc: annotations: {} # external-dns.alpha.kubernetes.io/hostname: oidc-discovery.example.org + jwtIssuer: oidc-discovery.example.org + domains: - localhost - spire-oidc.spire