From 63f2ad5057baa5a0b922fdbcb7ae57099afccc62 Mon Sep 17 00:00:00 2001 From: Youqing Han Date: Thu, 8 Jun 2023 17:21:25 +0800 Subject: [PATCH 1/2] Fix the immutable matchlabels issue when upgrade helm to v3.1.x --- deployments/helm-chart/templates/_helpers.tpl | 6 +++++- deployments/helm-chart/values.yaml | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/deployments/helm-chart/templates/_helpers.tpl b/deployments/helm-chart/templates/_helpers.tpl index e48513295f..b166ee5cc2 100644 --- a/deployments/helm-chart/templates/_helpers.tpl +++ b/deployments/helm-chart/templates/_helpers.tpl @@ -64,9 +64,13 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} Selector labels */}} {{- define "nginx-ingress.selectorLabels" -}} +{{- if .Values.controller.selectorLabels }} +{{ toYaml .Values.controller.selectorLabels }} +{{- else -}} app.kubernetes.io/name: {{ include "nginx-ingress.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} +{{- end -}} +{{- end -}} {{/* Expand the name of the configmap. diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml index d99ff35b98..eb6956cc99 100644 --- a/deployments/helm-chart/values.yaml +++ b/deployments/helm-chart/values.yaml @@ -5,6 +5,9 @@ controller: ## The kind of the Ingress Controller installation - deployment or daemonset. kind: deployment + ## The selectorLabels used to overide the default values. + selectorLabels: {} + ## Annotations for deployments and daemonsets annotations: {} From e02f509949181cb2ffe43acbcfa80910210ec438 Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Tue, 25 Jul 2023 16:48:56 -0700 Subject: [PATCH 2/2] Update deployments/helm-chart/templates/_helpers.tpl Signed-off-by: Luca Comellini --- deployments/helm-chart/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/helm-chart/templates/_helpers.tpl b/deployments/helm-chart/templates/_helpers.tpl index b166ee5cc2..b1351130a0 100644 --- a/deployments/helm-chart/templates/_helpers.tpl +++ b/deployments/helm-chart/templates/_helpers.tpl @@ -64,7 +64,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} Selector labels */}} {{- define "nginx-ingress.selectorLabels" -}} -{{- if .Values.controller.selectorLabels }} +{{- if .Values.controller.selectorLabels -}} {{ toYaml .Values.controller.selectorLabels }} {{- else -}} app.kubernetes.io/name: {{ include "nginx-ingress.name" . }}