Skip to content

Commit e08b1d3

Browse files
authored
Revert chart labels for seamless upgrades (#903)
* Revert chart labels for seamless upgrades
1 parent aee1366 commit e08b1d3

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

deployments/kubernetes/chart/reloader/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
name: reloader
33
description: Reloader chart that runs on kubernetes
4-
version: 2.1.1
4+
version: 2.1.2
55
appVersion: v1.4.1
66
keywords:
77
- Reloader

deployments/kubernetes/chart/reloader/templates/_helpers.tpl

+4-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ Create chart name and version as used by the chart label.
2828
{{- end }}
2929

3030
{{- define "reloader-labels.chart" -}}
31-
app.kubernetes.io/name: {{ include "reloader-name" . }}
32-
helm.sh/chart: {{ include "reloader-chart" . }}
33-
{{- if .Chart.AppVersion }}
34-
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
35-
{{- end}}
36-
app.kubernetes.io/instance: {{ .Release.Name | quote }}
31+
app: {{ template "reloader-fullname" . }}
32+
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
33+
release: {{ .Release.Name | quote }}
34+
heritage: {{ .Release.Service | quote }}
3735
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
3836
{{- end -}}
3937

deployments/kubernetes/chart/reloader/templates/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ spec:
2525
revisionHistoryLimit: {{ .Values.reloader.deployment.revisionHistoryLimit }}
2626
selector:
2727
matchLabels:
28-
app.kubernetes.io/name: {{ template "reloader-fullname" . }}
29-
app.kubernetes.io/instance: {{ .Release.Name | quote }}
28+
app: {{ template "reloader-fullname" . }}
29+
release: {{ .Release.Name | quote }}
3030
{{- if .Values.reloader.matchLabels }}
3131
{{ toYaml .Values.reloader.matchLabels | indent 6 }}
3232
{{- end }}

deployments/kubernetes/chart/reloader/templates/networkpolicy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ metadata:
1414
spec:
1515
podSelector:
1616
matchLabels:
17-
app.kubernetes.io/name: {{ template "reloader-fullname" . }}
18-
app.kubernetes.io/instance: {{ .Release.Name | quote }}
17+
app: {{ template "reloader-fullname" . }}
18+
release: {{ .Release.Name | quote }}
1919
{{- if .Values.reloader.matchLabels }}
2020
{{ toYaml .Values.reloader.matchLabels | indent 6 }}
2121
{{- end }}

deployments/kubernetes/chart/reloader/templates/poddisruptionbudget.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ spec:
1313
{{- end }}
1414
selector:
1515
matchLabels:
16-
app.kubernetes.io/name: {{ template "reloader-fullname" . }}
16+
app: {{ template "reloader-fullname" . }}
1717
{{- end }}

0 commit comments

Comments
 (0)