From 17d12cad8a0b639e1be25b2f55af3890c4d38fb4 Mon Sep 17 00:00:00 2001 From: nabeelsaabna Date: Sun, 9 Nov 2025 14:08:19 +0200 Subject: [PATCH 1/2] fix: allow custom labels on services --- helm-charts/mend-renovate-ce/Chart.yaml | 2 +- helm-charts/mend-renovate-ce/templates/service.yaml | 3 +++ helm-charts/mend-renovate-ce/values.yaml | 1 + helm-charts/mend-renovate-ee/Chart.yaml | 2 +- helm-charts/mend-renovate-ee/templates/server-svc.yaml | 3 +++ helm-charts/mend-renovate-ee/values.yaml | 1 + 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/helm-charts/mend-renovate-ce/Chart.yaml b/helm-charts/mend-renovate-ce/Chart.yaml index 8bd28f50..9e43158f 100644 --- a/helm-charts/mend-renovate-ce/Chart.yaml +++ b/helm-charts/mend-renovate-ce/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mend-renovate-ce -version: 12.0.1 +version: 12.0.2 appVersion: 12.0.0 description: Mend Renovate Community Edition home: https://github.com/mend/renovate-ce-ee diff --git a/helm-charts/mend-renovate-ce/templates/service.yaml b/helm-charts/mend-renovate-ce/templates/service.yaml index 5536625a..e06cebff 100644 --- a/helm-charts/mend-renovate-ce/templates/service.yaml +++ b/helm-charts/mend-renovate-ce/templates/service.yaml @@ -8,6 +8,9 @@ metadata: helm.sh/chart: {{ include "mend-renovate.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- with .Values.labels.service }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- with .Values.service.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/helm-charts/mend-renovate-ce/values.yaml b/helm-charts/mend-renovate-ce/values.yaml index c9b66dc9..9dcc330c 100644 --- a/helm-charts/mend-renovate-ce/values.yaml +++ b/helm-charts/mend-renovate-ce/values.yaml @@ -314,6 +314,7 @@ annotations: { } labels: deployment: { } pods: { } + service: { } nodeSelector: { } diff --git a/helm-charts/mend-renovate-ee/Chart.yaml b/helm-charts/mend-renovate-ee/Chart.yaml index 4c0f68ef..3993dc6f 100644 --- a/helm-charts/mend-renovate-ee/Chart.yaml +++ b/helm-charts/mend-renovate-ee/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mend-renovate-enterprise-edition -version: 6.0.2 +version: 6.0.3 appVersion: 12.0.0 description: Mend Renovate Enterprise Edition home: https://github.com/mend/renovate-ce-ee diff --git a/helm-charts/mend-renovate-ee/templates/server-svc.yaml b/helm-charts/mend-renovate-ee/templates/server-svc.yaml index 9f5de07f..cb5db96c 100644 --- a/helm-charts/mend-renovate-ee/templates/server-svc.yaml +++ b/helm-charts/mend-renovate-ee/templates/server-svc.yaml @@ -8,6 +8,9 @@ metadata: helm.sh/chart: {{ include "mend-renovate.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- with .Values.renovateServer.labels.service }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- with .Values.service.annotations }} annotations: {{- toYaml . | nindent 4 }} diff --git a/helm-charts/mend-renovate-ee/values.yaml b/helm-charts/mend-renovate-ee/values.yaml index f276a7b3..1bfc8a0d 100644 --- a/helm-charts/mend-renovate-ee/values.yaml +++ b/helm-charts/mend-renovate-ee/values.yaml @@ -239,6 +239,7 @@ renovateServer: labels: deployment: { } pods: { } + service: { } nodeSelector: { } From 56e76e2c69f9839348c5b12e246b17f28b7cdab1 Mon Sep 17 00:00:00 2001 From: nabeelsaabna Date: Sun, 9 Nov 2025 14:19:28 +0200 Subject: [PATCH 2/2] fix: correction --- helm-charts/mend-renovate-ce/templates/service.yaml | 2 +- helm-charts/mend-renovate-ce/values.yaml | 2 +- helm-charts/mend-renovate-ee/templates/server-svc.yaml | 2 +- helm-charts/mend-renovate-ee/values.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helm-charts/mend-renovate-ce/templates/service.yaml b/helm-charts/mend-renovate-ce/templates/service.yaml index e06cebff..625c18e7 100644 --- a/helm-charts/mend-renovate-ce/templates/service.yaml +++ b/helm-charts/mend-renovate-ce/templates/service.yaml @@ -8,7 +8,7 @@ metadata: helm.sh/chart: {{ include "mend-renovate.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - {{- with .Values.labels.service }} + {{- with .Values.service.labels }} {{- toYaml . | nindent 4 }} {{- end }} {{- with .Values.service.annotations }} diff --git a/helm-charts/mend-renovate-ce/values.yaml b/helm-charts/mend-renovate-ce/values.yaml index 9dcc330c..e64eaf04 100644 --- a/helm-charts/mend-renovate-ce/values.yaml +++ b/helm-charts/mend-renovate-ce/values.yaml @@ -281,6 +281,7 @@ service: https: 443 annotations: { } # cloud.google.com/load-balancer-type: "Internal" + labels: { } ingress: enabled: false @@ -314,7 +315,6 @@ annotations: { } labels: deployment: { } pods: { } - service: { } nodeSelector: { } diff --git a/helm-charts/mend-renovate-ee/templates/server-svc.yaml b/helm-charts/mend-renovate-ee/templates/server-svc.yaml index cb5db96c..54143760 100644 --- a/helm-charts/mend-renovate-ee/templates/server-svc.yaml +++ b/helm-charts/mend-renovate-ee/templates/server-svc.yaml @@ -8,7 +8,7 @@ metadata: helm.sh/chart: {{ include "mend-renovate.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} - {{- with .Values.renovateServer.labels.service }} + {{- with .Values.service.labels }} {{- toYaml . | nindent 4 }} {{- end }} {{- with .Values.service.annotations }} diff --git a/helm-charts/mend-renovate-ee/values.yaml b/helm-charts/mend-renovate-ee/values.yaml index 1bfc8a0d..bd06930d 100644 --- a/helm-charts/mend-renovate-ee/values.yaml +++ b/helm-charts/mend-renovate-ee/values.yaml @@ -239,7 +239,6 @@ renovateServer: labels: deployment: { } pods: { } - service: { } nodeSelector: { } @@ -562,6 +561,7 @@ service: http: 80 https: 443 # cloud.google.com/load-balancer-type: "Internal" + labels: { } ingress: enabled: false