Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions helm/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -49,7 +49,7 @@ spec:
{{ tpl (toYaml .Values.extraVolumes) . | nindent 8 }}
{{- end }}
containers:
- name: {{ $fullName | quote }}
- name: nginx
{{- with .Values.image }}
image: {{ $cloudProviderDockerRegistryUrl }}{{ .repository }}:{{ $tag }}
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions helm/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
Loading