Skip to content

Commit b001c3d

Browse files
mohsenmottaghimohsenmottaghi
authored
MINOR: kubernetes-ingress: Use templates for labels to remove duplication (#288)
Signed-off-by: Mohsen Mottaghi <[email protected]>
1 parent cf6d075 commit b001c3d

24 files changed

+95
-141
lines changed

‎kubernetes-ingress/templates/_helpers.tpl‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,65 @@ Create chart name and version as used by the chart label.
5757
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
5858
{{- end -}}
5959

60+
{{/*
61+
Create HAProxy Ingress Chart labels
62+
*/}}
63+
{{- define "kubernetes-ingress.helmChartLabels" -}}
64+
helm.sh/chart: {{ include "kubernetes-ingress.chart" . }}
65+
{{- if .Chart.AppVersion }}
66+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
67+
{{- end }}
68+
app.kubernetes.io/managed-by: {{ .Release.Service }}
69+
{{- end }}
70+
71+
{{/*
72+
Create HAProxy Ingress Selector labels
73+
*/}}
74+
{{- define "kubernetes-ingress.selectorLabels" -}}
75+
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
76+
app.kubernetes.io/instance: {{ .Release.Name }}
77+
{{- end }}
78+
79+
{{/*
80+
Create HAProxy Ingress labels
81+
*/}}
82+
{{- define "kubernetes-ingress.labels" -}}
83+
{{ include "kubernetes-ingress.selectorLabels" . }}
84+
{{ include "kubernetes-ingress.helmChartLabels" . }}
85+
{{- end }}
86+
87+
{{/*
88+
Create CRD Job selector labels
89+
*/}}
90+
{{- define "kubernetes-ingress.crdJobSelectorLabels" -}}
91+
app.kubernetes.io/name: {{ include "kubernetes-ingress.serviceProxyName" . }}
92+
app.kubernetes.io/instance: {{ .Release.Name }}
93+
{{- end }}
94+
95+
{{/*
96+
Create CRD Job labels
97+
*/}}
98+
{{- define "kubernetes-ingress.crdJobLabels" -}}
99+
{{ include "kubernetes-ingress.crdJobSelectorLabels" . }}
100+
{{ include "kubernetes-ingress.helmChartLabels" . }}
101+
{{- end }}
102+
103+
{{/*
104+
Create Service Proxy selector labels
105+
*/}}
106+
{{- define "kubernetes-ingress.serviceProxySelectorLabels" -}}
107+
app.kubernetes.io/name: {{ include "kubernetes-ingress.serviceProxyName" . }}
108+
app.kubernetes.io/instance: {{ .Release.Name }}
109+
{{- end }}
110+
111+
{{/*
112+
Create Service Proxy labels
113+
*/}}
114+
{{- define "kubernetes-ingress.serviceProxyLabels" -}}
115+
{{ include "kubernetes-ingress.serviceProxySelectorLabels" . }}
116+
{{ include "kubernetes-ingress.helmChartLabels" . }}
117+
{{- end }}
118+
60119
{{/*
61120
Encode an imagePullSecret string.
62121
*/}}

‎kubernetes-ingress/templates/clusterrole.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ kind: ClusterRole
2020
metadata:
2121
name: {{ include "kubernetes-ingress.fullname" . }}
2222
labels:
23-
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
24-
helm.sh/chart: {{ include "kubernetes-ingress.chart" . }}
25-
app.kubernetes.io/managed-by: {{ .Release.Service }}
26-
app.kubernetes.io/instance: {{ .Release.Name }}
27-
app.kubernetes.io/version: {{ .Chart.AppVersion }}
23+
{{- include "kubernetes-ingress.labels" . | nindent 4 }}
2824
rules:
2925
- apiGroups:
3026
- ""

‎kubernetes-ingress/templates/clusterrolebinding.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ kind: ClusterRoleBinding
2020
metadata:
2121
name: {{ include "kubernetes-ingress.fullname" . }}
2222
labels:
23-
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
24-
helm.sh/chart: {{ include "kubernetes-ingress.chart" . }}
25-
app.kubernetes.io/managed-by: {{ .Release.Service }}
26-
app.kubernetes.io/instance: {{ .Release.Name }}
27-
app.kubernetes.io/version: {{ .Chart.AppVersion }}
23+
{{- include "kubernetes-ingress.labels" . | nindent 4 }}
2824
roleRef:
2925
apiGroup: rbac.authorization.k8s.io
3026
kind: ClusterRole

‎kubernetes-ingress/templates/controller-configmap.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ metadata:
2020
name: {{ include "kubernetes-ingress.fullname" . }}
2121
namespace: {{ include "kubernetes-ingress.namespace" . }}
2222
labels:
23-
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
24-
helm.sh/chart: {{ include "kubernetes-ingress.chart" . }}
25-
app.kubernetes.io/managed-by: {{ .Release.Service }}
26-
app.kubernetes.io/instance: {{ .Release.Name }}
27-
app.kubernetes.io/version: {{ .Chart.AppVersion }}
23+
{{- include "kubernetes-ingress.labels" . | nindent 4 }}
2824
{{- if .Values.controller.configAnnotations }}
2925
annotations:
3026
{{ toYaml .Values.controller.configAnnotations | indent 4 }}

‎kubernetes-ingress/templates/controller-crdjob.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ metadata:
2020
name: {{ include "kubernetes-ingress.crdjob.fullname" . }}
2121
namespace: {{ include "kubernetes-ingress.namespace" . }}
2222
labels:
23-
app.kubernetes.io/name: {{ include "kubernetes-ingress.crdjob.fullname" . }}
24-
helm.sh/chart: {{ include "kubernetes-ingress.chart" . }}
25-
app.kubernetes.io/managed-by: {{ .Release.Service }}
26-
app.kubernetes.io/instance: {{ .Release.Name }}
27-
app.kubernetes.io/version: {{ .Chart.AppVersion }}
23+
{{- include "kubernetes-ingress.crdJobLabels" . | nindent 4 }}
2824
annotations:
2925
argocd.argoproj.io/hook: Sync
3026
argocd.argoproj.io/hook-delete-policy: HookSucceeded
@@ -38,8 +34,7 @@ spec:
3834
template:
3935
metadata:
4036
labels:
41-
app.kubernetes.io/name: {{ include "kubernetes-ingress.crdjob.fullname" . }}
42-
app.kubernetes.io/instance: {{ .Release.Name }}
37+
{{- include "kubernetes-ingress.crdJobSelectorLabels" . | nindent 8 }}
4338
{{- if .Values.controller.podLabels }}
4439
{{ toYaml .Values.controller.podLabels | indent 8 }}
4540
{{- end }}

‎kubernetes-ingress/templates/controller-daemonset.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@ metadata:
2525
name: {{ include "kubernetes-ingress.fullname" . }}
2626
namespace: {{ include "kubernetes-ingress.namespace" . }}
2727
labels:
28-
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
29-
helm.sh/chart: {{ include "kubernetes-ingress.chart" . }}
30-
app.kubernetes.io/managed-by: {{ .Release.Service }}
31-
app.kubernetes.io/instance: {{ .Release.Name }}
32-
app.kubernetes.io/version: {{ .Chart.AppVersion }}
28+
{{- include "kubernetes-ingress.labels" . | nindent 4 }}
3329
{{- if .Values.controller.extraLabels }}
3430
{{ toYaml .Values.controller.extraLabels | indent 4 }}
3531
{{- end }}
@@ -41,13 +37,11 @@ spec:
4137
{{- end }}
4238
selector:
4339
matchLabels:
44-
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
45-
app.kubernetes.io/instance: {{ .Release.Name }}
40+
{{- include "kubernetes-ingress.selectorLabels" . | nindent 6 }}
4641
template:
4742
metadata:
4843
labels:
49-
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
50-
app.kubernetes.io/instance: {{ .Release.Name }}
44+
{{- include "kubernetes-ingress.selectorLabels" . | nindent 8 }}
5145
{{- if .Values.controller.podLabels }}
5246
{{ toYaml .Values.controller.podLabels | indent 8 }}
5347
{{- end }}

‎kubernetes-ingress/templates/controller-defaultcertsecret.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ metadata:
2323
name: {{ include "kubernetes-ingress.defaultTLSSecret.fullname" . }}
2424
namespace: {{ include "kubernetes-ingress.namespace" . }}
2525
labels:
26-
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
27-
helm.sh/chart: {{ include "kubernetes-ingress.chart" . }}
28-
app.kubernetes.io/managed-by: {{ .Release.Service }}
29-
app.kubernetes.io/instance: {{ .Release.Name }}
30-
app.kubernetes.io/version: {{ .Chart.AppVersion }}
26+
{{- include "kubernetes-ingress.labels" . | nindent 4 }}
3127
annotations:
3228
"helm.sh/hook": "pre-install"
3329
"helm.sh/hook-delete-policy": "before-hook-creation"

‎kubernetes-ingress/templates/controller-deployment.yaml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ metadata:
2121
name: {{ include "kubernetes-ingress.fullname" . }}
2222
namespace: {{ include "kubernetes-ingress.namespace" . }}
2323
labels:
24-
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
25-
helm.sh/chart: {{ include "kubernetes-ingress.chart" . }}
26-
app.kubernetes.io/managed-by: {{ .Release.Service }}
27-
app.kubernetes.io/instance: {{ .Release.Name }}
28-
app.kubernetes.io/version: {{ .Chart.AppVersion }}
24+
{{- include "kubernetes-ingress.labels" . | nindent 4 }}
2925
{{- if .Values.controller.extraLabels }}
3026
{{ toYaml .Values.controller.extraLabels | indent 4 }}
3127
{{- end }}
@@ -36,17 +32,15 @@ spec:
3632
minReadySeconds: {{ .Values.controller.minReadySeconds }}
3733
selector:
3834
matchLabels:
39-
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
40-
app.kubernetes.io/instance: {{ .Release.Name }}
35+
{{- include "kubernetes-ingress.selectorLabels" . | nindent 6 }}
4136
{{- with .Values.controller.strategy }}
4237
strategy:
4338
{{- toYaml . | nindent 4 }}
4439
{{- end }}
4540
template:
4641
metadata:
4742
labels:
48-
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
49-
app.kubernetes.io/instance: {{ .Release.Name }}
43+
{{- include "kubernetes-ingress.selectorLabels" . | nindent 8 }}
5044
{{- if .Values.controller.podLabels }}
5145
{{ toYaml .Values.controller.podLabels | indent 8 }}
5246
{{- end }}

‎kubernetes-ingress/templates/controller-hpa.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ metadata:
3232
name: {{ include "kubernetes-ingress.fullname" . }}
3333
namespace: {{ include "kubernetes-ingress.namespace" . }}
3434
labels:
35-
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
36-
helm.sh/chart: {{ include "kubernetes-ingress.chart" . }}
37-
app.kubernetes.io/managed-by: {{ .Release.Service }}
38-
app.kubernetes.io/instance: {{ .Release.Name }}
39-
app.kubernetes.io/version: {{ .Chart.AppVersion }}
35+
{{- include "kubernetes-ingress.labels" . | nindent 4 }}
4036
spec:
4137
scaleTargetRef:
4238
apiVersion: apps/v1

‎kubernetes-ingress/templates/controller-ingressclass.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ kind: IngressClass
2424
metadata:
2525
name: {{ .Values.controller.ingressClassResource.name }}
2626
labels:
27-
app.kubernetes.io/name: {{ include "kubernetes-ingress.name" . }}
28-
helm.sh/chart: {{ include "kubernetes-ingress.chart" . }}
29-
app.kubernetes.io/managed-by: {{ .Release.Service }}
30-
app.kubernetes.io/instance: {{ .Release.Name }}
31-
app.kubernetes.io/version: {{ .Chart.AppVersion }}
27+
{{- include "kubernetes-ingress.labels" . | nindent 4 }}
3228
{{- if .Values.controller.ingressClassResource.default }}
3329
annotations:
3430
ingressclass.kubernetes.io/is-default-class: "true"

0 commit comments

Comments
 (0)