Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add "app.kubernetes.io/name" to gateway.podlabels #50540

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

add "app.kubernetes.io/name" to gateway.podlabels #50540

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f32ab97
add "app.kubernetes.io/name" to `gateway.podLabels`
lukmdo Apr 18, 2024
0457dfc
opt: (cleanup) move `istio.io/rev` label to `gateway.podLabels`
lukmdo Apr 18, 2024
281c532
review: add app.kubernetes.io/version to gateway.podLabels
lukmdo Apr 19, 2024
3ac9a50
review: (opt cleanup) use `gateway.podLabels` in `gateway.labels`
lukmdo Apr 19, 2024
5f32127
review: add gateway.sidecarInjectionLabels, drop gateway.podLabels
lukmdo Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 8 additions & 10 deletions manifests/charts/gateway/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,19 @@ Create chart name and version as used by the chart label.

{{- define "gateway.labels" -}}
helm.sh/chart: {{ include "gateway.chart" . }}
{{ include "gateway.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/name: {{ include "gateway.name" . }}
{{- range $key, $val := .Values.labels }}
{{- if not (or (eq $key "app") (eq $key "istio")) }}
{{ $key | quote }}: {{ $val | quote }}
{{- end }}
{{- end }}
{{ include "gateway.podLabels" . }}
lukmdo marked this conversation as resolved.
Show resolved Hide resolved
{{- end }}

{{- define "gateway.podLabels" -}}
{{ include "gateway.selectorLabels" . }}
app.kubernetes.io/name: {{ include "gateway.name" . }}
{{- with .Chart.AppVersion }}
app.kubernetes.io/version: {{ . | quote }}
{{- end }}
{{- with .Values.revision }}
istio.io/rev: {{ . | quote }}
lukmdo marked this conversation as resolved.
Show resolved Hide resolved
{{- end }}
{{- range $key, $val := .Values.labels }}
{{- if not (or (eq $key "app") (eq $key "istio")) }}
{{ $key | quote }}: {{ $val | quote }}
Expand Down
3 changes: 0 additions & 3 deletions manifests/charts/gateway/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ spec:
{{- end }}
labels:
sidecar.istio.io/inject: "true"
lukmdo marked this conversation as resolved.
Show resolved Hide resolved
{{- with .Values.revision }}
istio.io/rev: {{ . | quote }}
{{- end }}
{{- include "gateway.podLabels" . | nindent 8 }}
lukmdo marked this conversation as resolved.
Show resolved Hide resolved
spec:
{{- with .Values.imagePullSecrets }}
Expand Down