From 225931565a301167629466d77de3436274fad981 Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Mon, 16 Jan 2023 17:11:06 +0100 Subject: [PATCH] Include spire namespace to fix oidc-provider Signed-off-by: Marco Franssen Co-authored-by: Gert Jan Kamstra Signed-off-by: Marco Franssen --- charts/spire/charts/spire-server/README.md | 4 +++- .../spire-server/templates/controller-manager-configmap.yaml | 4 ---- charts/spire/charts/spire-server/values.yaml | 5 ++++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md index 7f248f9..d4de0d9 100644 --- a/charts/spire/charts/spire-server/README.md +++ b/charts/spire/charts/spire-server/README.md @@ -23,7 +23,9 @@ A Helm chart to install the SPIRE server. | controllerManager.identities.enabled | bool | `true` | | | controllerManager.identities.podSelector | object | `{}` | | | controllerManager.identities.spiffeIDTemplate | string | `"spiffe://{{ .TrustDomain }}/ns/{{ .PodMeta.Namespace }}/sa/{{ .PodSpec.ServiceAccountName }}"` | | -| controllerManager.ignoreNamespaces | list | `[]` | | +| controllerManager.ignoreNamespaces[0] | string | `"kube-system"` | | +| controllerManager.ignoreNamespaces[1] | string | `"kube-public"` | | +| controllerManager.ignoreNamespaces[2] | string | `"local-path-storage"` | | | controllerManager.image.pullPolicy | string | `"IfNotPresent"` | | | controllerManager.image.registry | string | `"ghcr.io"` | | | controllerManager.image.repository | string | `"spiffe/spire-controller-manager"` | | diff --git a/charts/spire/charts/spire-server/templates/controller-manager-configmap.yaml b/charts/spire/charts/spire-server/templates/controller-manager-configmap.yaml index 5a2edb3..b177acc 100644 --- a/charts/spire/charts/spire-server/templates/controller-manager-configmap.yaml +++ b/charts/spire/charts/spire-server/templates/controller-manager-configmap.yaml @@ -24,10 +24,6 @@ data: clusterName: {{ .Values.clusterName }} trustDomain: {{ .Values.trustDomain }} ignoreNamespaces: - - kube-system - - kube-public - - {{ .Release.Namespace }} - - local-path-storage {{- with .Values.controllerManager.ignoreNamespaces }} {{- toYaml . | nindent 6 }} {{- end }} diff --git a/charts/spire/charts/spire-server/values.yaml b/charts/spire/charts/spire-server/values.yaml index 091cb07..5b3d429 100644 --- a/charts/spire/charts/spire-server/values.yaml +++ b/charts/spire/charts/spire-server/values.yaml @@ -142,7 +142,10 @@ controllerManager: port: 443 annotations: {} - ignoreNamespaces: [] + ignoreNamespaces: + - kube-system + - kube-public + - local-path-storage identities: enabled: true