From 2a692c3d26ecca6936e60b5084cce88bdb061f88 Mon Sep 17 00:00:00 2001 From: shimoncohen Date: Tue, 23 Jun 2026 11:41:49 +0300 Subject: [PATCH 1/2] helm: set nginx app name --- helm/templates/deployment.yaml | 8 ++++---- helm/templates/service.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index 97dd0ac..82eb7f2 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -11,7 +11,7 @@ kind: Deployment metadata: name: {{ printf "%s-deployment" (include "nginx.fullname" .) }} labels: - app: {{ $fullName | quote }} + app: {{ .Values.nameOverride | default "nginx" }} component: nginx-deployment environment: {{ include "nginx.environment" . }} release: {{ .Release.Name }} @@ -20,14 +20,14 @@ spec: replicas: {{ .Values.replicaCount }} selector: matchLabels: - app: {{ $fullName | quote }} + app: {{ .Values.nameOverride | default "nginx" }} release: {{ .Release.Name }} run: {{ .Release.Name }}-nginx {{- include "nginx.selectorLabels" . | nindent 6 }} template: metadata: labels: - app: {{ $fullName | quote }} + app: {{ .Values.nameOverride | default "nginx" }} release: {{ .Release.Name }} run: {{ .Release.Name }}-nginx {{- include "nginx.labels" . | nindent 8 }} @@ -49,7 +49,7 @@ spec: {{ tpl (toYaml .Values.extraVolumes) . | nindent 8 }} {{- end }} containers: - - name: {{ $fullName | quote }} + - name: {{ .Values.nameOverride | default "nginx" }} {{- with .Values.image }} image: {{ $cloudProviderDockerRegistryUrl }}{{ .repository }}:{{ $tag }} {{- end }} diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml index 4ab89d6..532598c 100644 --- a/helm/templates/service.yaml +++ b/helm/templates/service.yaml @@ -10,7 +10,7 @@ kind: Service metadata: name: {{ printf "%s-service" (include "nginx.fullname" .) }} labels: - app: {{ $fullName | quote }} + app: {{ .Values.nameOverride | default "nginx" }} component: nginx-service environment: {{ include "nginx.environment" . }} release: {{ .Release.Name }} @@ -39,7 +39,7 @@ spec: name: prometheus-exporter {{- end }} selector: - app: {{ $fullName | quote }} + app: {{ .Values.nameOverride | default "nginx" }} release: {{ .Release.Name }} run: {{ .Release.Name }}-nginx {{- include "nginx.selectorLabels" . | nindent 4 }} From 2b67b54eedc74d50cb0c056d82d8d524e059cb17 Mon Sep 17 00:00:00 2001 From: shimoncohen Date: Tue, 23 Jun 2026 11:44:58 +0300 Subject: [PATCH 2/2] helm: make nginx container name explicit --- helm/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index 82eb7f2..7c77bbb 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -49,7 +49,7 @@ spec: {{ tpl (toYaml .Values.extraVolumes) . | nindent 8 }} {{- end }} containers: - - name: {{ .Values.nameOverride | default "nginx" }} + - name: nginx {{- with .Values.image }} image: {{ $cloudProviderDockerRegistryUrl }}{{ .repository }}:{{ $tag }} {{- end }}