Skip to content

Commit 0ff6d0f

Browse files
msafwankarimmsafwankarim
authored
Merge pull request #938 from vmizoules/feat(chart)_allow_templating_labels
[helm] Add templating support for additionals labels
2 parents 22ee53a + b064114 commit 0ff6d0f

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

‎deployments/kubernetes/chart/reloader/templates/clusterrole.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ metadata:
1111
labels:
1212
{{ include "reloader-labels.chart" . | indent 4 }}
1313
{{- if .Values.reloader.rbac.labels }}
14-
{{ toYaml .Values.reloader.rbac.labels | indent 4 }}
14+
{{ tpl (toYaml .Values.reloader.rbac.labels) . | indent 4 }}
1515
{{- end }}
1616
{{- if .Values.reloader.matchLabels }}
17-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
17+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
1818
{{- end }}
1919
name: {{ template "reloader-fullname" . }}-role
2020
rules:

‎deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ metadata:
1111
labels:
1212
{{ include "reloader-labels.chart" . | indent 4 }}
1313
{{- if .Values.reloader.rbac.labels }}
14-
{{ toYaml .Values.reloader.rbac.labels | indent 4 }}
14+
{{ tpl (toYaml .Values.reloader.rbac.labels) . | indent 4 }}
1515
{{- end }}
1616
{{- if .Values.reloader.matchLabels }}
17-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
17+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
1818
{{- end }}
1919
name: {{ template "reloader-fullname" . }}-role-binding
2020
roleRef:

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ metadata:
44
annotations:
55
{{ include "reloader-helm3.annotations" . | indent 4 }}
66
{{- if .Values.reloader.deployment.annotations }}
7-
{{ toYaml .Values.reloader.deployment.annotations | indent 4 }}
7+
{{ tpl (toYaml .Values.reloader.deployment.annotations) . | indent 4 }}
88
{{- end }}
99
labels:
1010
{{ include "reloader-labels.chart" . | indent 4 }}
1111
{{- if .Values.reloader.deployment.labels }}
12-
{{ toYaml .Values.reloader.deployment.labels | indent 4 }}
12+
{{ tpl (toYaml .Values.reloader.deployment.labels) . | indent 4 }}
1313
{{- end }}
1414
{{- if .Values.reloader.matchLabels }}
15-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
15+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
1616
{{- end }}
1717
name: {{ template "reloader-fullname" . }}
1818
namespace: {{ .Values.namespace | default .Release.Namespace }}
@@ -28,21 +28,21 @@ spec:
2828
app: {{ template "reloader-fullname" . }}
2929
release: {{ .Release.Name | quote }}
3030
{{- if .Values.reloader.matchLabels }}
31-
{{ toYaml .Values.reloader.matchLabels | indent 6 }}
31+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 6 }}
3232
{{- end }}
3333
template:
3434
metadata:
3535
{{- if .Values.reloader.deployment.pod.annotations }}
3636
annotations:
37-
{{ toYaml .Values.reloader.deployment.pod.annotations | indent 8 }}
37+
{{ tpl (toYaml .Values.reloader.deployment.pod.annotations) . | indent 8 }}
3838
{{- end }}
3939
labels:
4040
{{ include "reloader-labels.chart" . | indent 8 }}
4141
{{- if .Values.reloader.deployment.labels }}
42-
{{ toYaml .Values.reloader.deployment.labels | indent 8 }}
42+
{{ tpl (toYaml .Values.reloader.deployment.labels) . | indent 8 }}
4343
{{- end }}
4444
{{- if .Values.reloader.matchLabels }}
45-
{{ toYaml .Values.reloader.matchLabels | indent 8 }}
45+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 8 }}
4646
{{- end }}
4747
spec:
4848
{{- with .Values.global.imagePullSecrets }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
{{ include "reloader-labels.chart" . | indent 4 }}
99
{{- if .Values.reloader.matchLabels }}
10-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
10+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
1111
{{- end }}
1212
name: {{ template "reloader-fullname" . }}
1313
namespace: {{ .Values.namespace | default .Release.Namespace }}
@@ -17,7 +17,7 @@ spec:
1717
app: {{ template "reloader-fullname" . }}
1818
release: {{ .Release.Name | quote }}
1919
{{- if .Values.reloader.matchLabels }}
20-
{{ toYaml .Values.reloader.matchLabels | indent 6 }}
20+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 6 }}
2121
{{- end }}
2222
policyTypes:
2323
- Ingress

‎deployments/kubernetes/chart/reloader/templates/role.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ metadata:
1111
labels:
1212
{{ include "reloader-labels.chart" . | indent 4 }}
1313
{{- if .Values.reloader.rbac.labels }}
14-
{{ toYaml .Values.reloader.rbac.labels | indent 4 }}
14+
{{ tpl (toYaml .Values.reloader.rbac.labels) . | indent 4 }}
1515
{{- end }}
1616
{{- if .Values.reloader.matchLabels }}
17-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
17+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
1818
{{- end }}
1919
name: {{ template "reloader-fullname" . }}-role
2020
namespace: {{ .Values.namespace | default .Release.Namespace }}

‎deployments/kubernetes/chart/reloader/templates/rolebinding.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ metadata:
1111
labels:
1212
{{ include "reloader-labels.chart" . | indent 4 }}
1313
{{- if .Values.reloader.rbac.labels }}
14-
{{ toYaml .Values.reloader.rbac.labels | indent 4 }}
14+
{{ tpl (toYaml .Values.reloader.rbac.labels) . | indent 4 }}
1515
{{- end }}
1616
{{- if .Values.reloader.matchLabels }}
17-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
17+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
1818
{{- end }}
1919
name: {{ template "reloader-fullname" . }}-role-binding
2020
namespace: {{ .Values.namespace | default .Release.Namespace }}

‎deployments/kubernetes/chart/reloader/templates/service.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ metadata:
55
annotations:
66
{{ include "reloader-helm3.annotations" . | indent 4 }}
77
{{- if .Values.reloader.service.annotations }}
8-
{{ toYaml .Values.reloader.service.annotations | indent 4 }}
8+
{{ tpl (toYaml .Values.reloader.service.annotations) . | indent 4 }}
99
{{- end }}
1010
labels:
1111
{{ include "reloader-labels.chart" . | indent 4 }}
1212
{{- if .Values.reloader.service.labels }}
13-
{{ toYaml .Values.reloader.service.labels | indent 4 }}
13+
{{ tpl (toYaml .Values.reloader.service.labels) . | indent 4 }}
1414
{{- end }}
1515
name: {{ template "reloader-fullname" . }}
1616
namespace: {{ .Values.namespace | default .Release.Namespace }}
1717
spec:
1818
selector:
1919
{{- if .Values.reloader.deployment.labels }}
20-
{{ toYaml .Values.reloader.deployment.labels | indent 4 }}
20+
{{ tpl (toYaml .Values.reloader.deployment.labels) . | indent 4 }}
2121
{{- end }}
2222
{{- if .Values.reloader.matchLabels }}
23-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
23+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
2424
{{- end }}
2525
ports:
2626
- port: {{ .Values.reloader.service.port }}

‎deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ metadata:
1111
annotations:
1212
{{ include "reloader-helm3.annotations" . | indent 4 }}
1313
{{- if .Values.reloader.serviceAccount.annotations }}
14-
{{ toYaml .Values.reloader.serviceAccount.annotations | indent 4 }}
14+
{{ tpl (toYaml .Values.reloader.serviceAccount.annotations) . | indent 4 }}
1515
{{- end }}
1616
labels:
1717
{{ include "reloader-labels.chart" . | indent 4 }}
1818
{{- if .Values.reloader.serviceAccount.labels }}
19-
{{ toYaml .Values.reloader.serviceAccount.labels | indent 4 }}
19+
{{ tpl (toYaml .Values.reloader.serviceAccount.labels) . | indent 4 }}
2020
{{- end }}
2121
{{- if .Values.reloader.matchLabels }}
22-
{{ toYaml .Values.reloader.matchLabels | indent 4 }}
22+
{{ tpl (toYaml .Values.reloader.matchLabels) . | indent 4 }}
2323
{{- end }}
2424
name: {{ template "reloader-serviceAccountName" . }}
2525
namespace: {{ .Values.namespace | default .Release.Namespace }}

0 commit comments

Comments
 (0)