From 10f0138a25730cbf0c71b920b134e25f3242a582 Mon Sep 17 00:00:00 2001
From: Marco Franssen <marco.franssen@philips.com>
Date: Fri, 4 Nov 2022 12:13:56 +0100
Subject: [PATCH] Enable oidc service domains in oidc by default

Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
---
 charts/spire/templates/oidc-dp-configmap.yaml | 14 +++++++++-----
 charts/spire/values.yaml                      |  2 --
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/charts/spire/templates/oidc-dp-configmap.yaml b/charts/spire/templates/oidc-dp-configmap.yaml
index 6b06b98..e14d627 100644
--- a/charts/spire/templates/oidc-dp-configmap.yaml
+++ b/charts/spire/templates/oidc-dp-configmap.yaml
@@ -7,11 +7,15 @@ metadata:
 data:
   oidc-discovery-provider.conf: |
     log_level = "{{ .Values.oidc.logLevel }}"
-    {{ if gt (len .Values.oidc.domains) 0 }}
-    domains = ["{{- join "\", \"" .Values.oidc.domains }}"]
-    {{ else }}
-    domains = []
-    {{ end }}
+
+    domains = [
+      "spire-oidc.{{ .Release.Namespace }}",
+      "spire-oidc.{{ .Release.Namespace }}.svc.cluster.local",
+    {{- if gt (len .Values.oidc.domains) 0 }}
+      "{{- join "\",\n      \"" .Values.oidc.domains }}"
+    {{- end }}
+    ]
+
     {{- if .Values.oidc.insecureScheme.enabled }}
     allow_insecure_scheme = {{ .Values.oidc.insecureScheme.enabled }}
     listen_socket_path = "/run/spire/oidc-sockets/oidc-server.sock"
diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml
index 967a079..65993eb 100644
--- a/charts/spire/values.yaml
+++ b/charts/spire/values.yaml
@@ -150,8 +150,6 @@ oidc:
 
   domains:
     - localhost
-    - spire-oidc.spire
-    - spire-oidc.spire.svc.cluster.local
     - oidc-discovery.example.org
 
   podSecurityContext: {}