From 05e7e4a1bc2088bd057343ed632982e9f61e11fa Mon Sep 17 00:00:00 2001 From: Ben Luzarraga Date: Tue, 30 Sep 2025 12:16:31 -0500 Subject: [PATCH 1/2] remove label variable from template Signed-off-by: Ben Luzarraga --- helm/templates/00-rbac.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/helm/templates/00-rbac.yaml b/helm/templates/00-rbac.yaml index 3445db7..146c4a0 100644 --- a/helm/templates/00-rbac.yaml +++ b/helm/templates/00-rbac.yaml @@ -6,9 +6,6 @@ {{- if .Values.global.instanceNamespace }} {{- $namespaces = append $namespaces .Values.global.instanceNamespace }} {{- end }} -{{- if .Values.cpfs.labels }} - {{- $labels := .Values.cpfs.labels }} -{{- end }} {{- range $i := $namespaces }} kind: Role apiVersion: rbac.authorization.k8s.io/v1 @@ -18,10 +15,10 @@ metadata: labels: component-id: {{ $chartName }} {{- if .Values.cpfs.labels }} - {{- with $labels }} + {{- with .Values.cpfs.labels }} {{- toYaml . | nindent 4 }} {{- end }} - {{- end }} + {{- end}} rules: - verbs: - create @@ -103,10 +100,10 @@ metadata: labels: component-id: {{ $chartName }} {{- if .Values.cpfs.labels }} - {{- with $labels }} + {{- with .Values.cpfs.labels }} {{- toYaml . | nindent 4 }} {{- end }} - {{- end }} + {{- end}} subjects: - kind: ServiceAccount name: ibm-namespace-scope-operator @@ -126,9 +123,9 @@ metadata: app.kubernetes.io/name: ibm-namespace-scope-operator component-id: {{ .Chart.Name }} {{- if .Values.cpfs.labels }} - {{- with $labels }} + {{- with .Values.cpfs.labels }} {{- toYaml . | nindent 4 }} {{- end }} - {{- end }} + {{- end}} name: ibm-namespace-scope-operator namespace: {{ .Values.global.operatorNamespace }} \ No newline at end of file From 2291e0d2592bf5f1c3a10d24d20680e2a545f1a7 Mon Sep 17 00:00:00 2001 From: Ben Luzarraga Date: Tue, 30 Sep 2025 12:28:40 -0500 Subject: [PATCH 2/2] debugging within loop Signed-off-by: Ben Luzarraga --- helm/templates/00-rbac.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/templates/00-rbac.yaml b/helm/templates/00-rbac.yaml index 146c4a0..9453f6b 100644 --- a/helm/templates/00-rbac.yaml +++ b/helm/templates/00-rbac.yaml @@ -14,8 +14,8 @@ metadata: namespace: {{ $i }} labels: component-id: {{ $chartName }} - {{- if .Values.cpfs.labels }} - {{- with .Values.cpfs.labels }} + {{- if $.Values.cpfs.labels }} + {{- with $.Values.cpfs.labels }} {{- toYaml . | nindent 4 }} {{- end }} {{- end}} @@ -99,8 +99,8 @@ metadata: namespace: {{ $i }} labels: component-id: {{ $chartName }} - {{- if .Values.cpfs.labels }} - {{- with .Values.cpfs.labels }} + {{- if $.Values.cpfs.labels }} + {{- with $.Values.cpfs.labels }} {{- toYaml . | nindent 4 }} {{- end }} {{- end}}