From 4a6c705e6a9d7009328a623059dd7fb9b62ab72b Mon Sep 17 00:00:00 2001 From: kfox1111 Date: Wed, 24 Jan 2024 00:20:18 -0800 Subject: [PATCH] Update the CRs to enable multiple instance nesting without naming conflicts (#189) --- charts/spire/charts/spire-server/README.md | 1 + charts/spire/charts/spire-server/templates/_helpers.tpl | 2 +- .../spire-server/templates/controller-manager-cluster-ids.yaml | 2 +- .../spire-server/templates/controller-manager-configmap.yaml | 2 +- .../charts/spire-server/templates/controller-manager-ftd.yaml | 2 +- .../templates/controller-manager-static-entries.yaml | 2 +- charts/spire/charts/spire-server/values.yaml | 3 +++ 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md index c43712c..1f8f7e9 100644 --- a/charts/spire/charts/spire-server/README.md +++ b/charts/spire/charts/spire-server/README.md @@ -88,6 +88,7 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr | `image.tag` | Overrides the image tag whose default is the chart appVersion | `""` | | `imagePullSecrets` | Pull secrets for images | `[]` | | `nameOverride` | Name override | `""` | +| `crNameOverride` | Name override for any custom resources | `""` | | `namespaceOverride` | Namespace override | `""` | | `fullnameOverride` | Fullname override | `""` | | `serviceAccount.create` | Specifies whether a service account should be created | `true` | diff --git a/charts/spire/charts/spire-server/templates/_helpers.tpl b/charts/spire/charts/spire-server/templates/_helpers.tpl index 75050af..d2ecb39 100644 --- a/charts/spire/charts/spire-server/templates/_helpers.tpl +++ b/charts/spire/charts/spire-server/templates/_helpers.tpl @@ -261,6 +261,6 @@ The code below determines what connection type should be used. {{- if .Values.controllerManager.className }} {{- .Values.controllerManager.className }} {{- else }} -{{- .Release.Namespace }}-{{ .Release.Name }} +{{- .Release.Namespace }}-{{ default .Release.Name .Values.crNameOverride }} {{- end -}} {{- end -}} 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 c22e9c0..cbd5400 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 @@ -49,7 +49,7 @@ matchLabels: apiVersion: spire.spiffe.io/v1alpha1 kind: ClusterSPIFFEID metadata: - name: {{ $root.Release.Namespace }}-{{ $root.Release.Name }}-{{ $key }} + name: {{ $root.Release.Namespace }}-{{ default $root.Release.Name $root.Values.crNameOverride }}-{{ $key }} {{- with $value.annotations }} annotations: {{- toYaml . | nindent 4 }} 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 80c530f..f11982f 100644 --- a/charts/spire/charts/spire-server/templates/controller-manager-configmap.yaml +++ b/charts/spire/charts/spire-server/templates/controller-manager-configmap.yaml @@ -23,7 +23,7 @@ data: healthProbeBindAddress: 0.0.0.0:8083 leaderElection: leaderElect: true - resourceName: {{ .Release.Name | sha256sum | trunc 8 }}.spiffe.io + resourceName: {{ printf "%s-%s" .Release.Namespace (default .Release.Name .Values.crNameOverride) | sha256sum | trunc 8 }}.spiffe.io resourceNamespace: {{ include "spire-server.namespace" . }} {{- with .Values.controllerManager.cacheNamespaces }} cacheNamespaces: diff --git a/charts/spire/charts/spire-server/templates/controller-manager-ftd.yaml b/charts/spire/charts/spire-server/templates/controller-manager-ftd.yaml index 1c2b659..d41c0b7 100644 --- a/charts/spire/charts/spire-server/templates/controller-manager-ftd.yaml +++ b/charts/spire/charts/spire-server/templates/controller-manager-ftd.yaml @@ -16,7 +16,7 @@ apiVersion: spire.spiffe.io/v1alpha1 kind: ClusterFederatedTrustDomain metadata: - name: {{ $root.Release.Namespace }}-{{ $root.Release.Name }}-{{ $key }} + name: {{ $root.Release.Namespace }}-{{ default $root.Release.Name $root.Values.crNameOverride }}-{{ $key }} {{- with $value.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/charts/spire/charts/spire-server/templates/controller-manager-static-entries.yaml b/charts/spire/charts/spire-server/templates/controller-manager-static-entries.yaml index 47629c4..df76208 100644 --- a/charts/spire/charts/spire-server/templates/controller-manager-static-entries.yaml +++ b/charts/spire/charts/spire-server/templates/controller-manager-static-entries.yaml @@ -16,7 +16,7 @@ apiVersion: spire.spiffe.io/v1alpha1 kind: ClusterStaticEntry metadata: - name: {{ $root.Release.Namespace }}-{{ $root.Release.Name }}-{{ $key }} + name: {{ $root.Release.Namespace }}-{{ default $root.Release.Name $root.Values.crNameOverride }}-{{ $key }} {{- with $value.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/charts/spire/charts/spire-server/values.yaml b/charts/spire/charts/spire-server/values.yaml index f56226b..e89b097 100644 --- a/charts/spire/charts/spire-server/values.yaml +++ b/charts/spire/charts/spire-server/values.yaml @@ -26,6 +26,9 @@ imagePullSecrets: [] ## @param nameOverride Name override nameOverride: "" +## @param crNameOverride Name override for any custom resources +crNameOverride: "" + ## @param namespaceOverride Namespace override namespaceOverride: ""