From 34488973165d1dcab9ba136deda29e24c9d63d12 Mon Sep 17 00:00:00 2001 From: Ken Huffman Date: Fri, 3 Feb 2023 09:22:20 -0500 Subject: [PATCH] Add namespaceSelector for spire-controller-manager (#112) Co-authored-by: Marco Franssen Signed-off-by: Marco Franssen --- charts/spire/charts/spire-server/README.md | 1 + .../templates/controller-manager-cluster-ids.yaml | 4 ++++ charts/spire/charts/spire-server/values.yaml | 3 +++ 3 files changed, 8 insertions(+) diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md index d4de0d9..8650943 100644 --- a/charts/spire/charts/spire-server/README.md +++ b/charts/spire/charts/spire-server/README.md @@ -21,6 +21,7 @@ A Helm chart to install the SPIRE server. | controllerManager.enabled | bool | `false` | | | controllerManager.identities.dnsNameTemplates | list | `[]` | | | controllerManager.identities.enabled | bool | `true` | | +| controllerManager.identities.namespaceSelector | object | `{}` | | | controllerManager.identities.podSelector | object | `{}` | | | controllerManager.identities.spiffeIDTemplate | string | `"spiffe://{{ .TrustDomain }}/ns/{{ .PodMeta.Namespace }}/sa/{{ .PodSpec.ServiceAccountName }}"` | | | controllerManager.ignoreNamespaces[0] | string | `"kube-system"` | | diff --git a/charts/spire/charts/spire-server/templates/controller-manager-cluster-ids.yaml b/charts/spire/charts/spire-server/templates/controller-manager-cluster-ids.yaml index 2818c1f..6bac89f 100644 --- a/charts/spire/charts/spire-server/templates/controller-manager-cluster-ids.yaml +++ b/charts/spire/charts/spire-server/templates/controller-manager-cluster-ids.yaml @@ -11,6 +11,10 @@ spec: podSelector: {{- toYaml . | nindent 4 }} {{- end }} + {{- with .identities.namespaceSelector }} + namespaceSelector: + {{- toYaml . | nindent 4 }} + {{- end }} {{- with .identities.dnsNameTemplates }} dnsNameTemplates: {{- toYaml . | nindent 4 }} diff --git a/charts/spire/charts/spire-server/values.yaml b/charts/spire/charts/spire-server/values.yaml index 5b3d429..9176fac 100644 --- a/charts/spire/charts/spire-server/values.yaml +++ b/charts/spire/charts/spire-server/values.yaml @@ -154,6 +154,9 @@ controllerManager: podSelector: {} # matchLabels: # spiffe.io/spiffe-id: "true" + namespaceSelector: {} + # matchLabels: + # spiffe.io/spiffe-id: "true" dnsNameTemplates: [] # - '{{ index .PodMeta.Labels "app.kubernetes.io/name" }}.{{ .PodMeta.Namespace }}.svc.cluster.local'