Skip to content

Commit 51ad2eb

Browse files
committed
put labels in _helper.tpl
1 parent 08c7333 commit 51ad2eb

File tree

7 files changed

+45
-11
lines changed

7 files changed

+45
-11
lines changed

charts/templates/_helpers.tpl

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{{/*
2+
Expand the name of the chart.
3+
*/}}
4+
{{- define "api7-ingress-controller-manager.name" -}}
5+
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
6+
{{- end }}
7+
8+
{{/*
9+
Create chart name and version as used by the chart label.
10+
*/}}
11+
{{- define "api7-ingress-controller-manager.chart" -}}
12+
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
13+
{{- end }}
14+
{{/*
15+
Common labels
16+
*/}}
17+
{{- define "api7-ingress-controller-manager.labels" -}}
18+
helm.sh/chart: {{ include "api7-ingress-controller-manager.chart" . }}
19+
{{ include "api7-ingress-controller-manager.selectorLabels" . }}
20+
{{- if .Chart.AppVersion }}
21+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
22+
{{- end }}
23+
app.kubernetes.io/managed-by: {{ .Release.Service }}
24+
{{- end }}
25+
26+
{{/*
27+
Selector labels
28+
*/}}
29+
{{- define "api7-ingress-controller-manager.selectorLabels" -}}
30+
{{- if .Values.labelsOverride }}
31+
{{- tpl (.Values.labelsOverride | toYaml) . }}
32+
{{- else }}
33+
app.kubernetes.io/name: {{ include "api7-ingress-controller-manager.name" . }}
34+
app.kubernetes.io/instance: {{ .Release.Name }}
35+
{{- end }}
36+
{{- end }}

charts/templates/cluster_role_binding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRoleBinding
33
metadata:
44
labels:
5-
app.kubernetes.io/name: api7-ingress
5+
{{- include "api7-ingress-controller-manager.labels" . | nindent 4 }}
66
name: {{ .Release.Name }}-{{ .Release.Name }}-api7-ingress-manager-rolebinding
77
roleRef:
88
apiGroup: rbac.authorization.k8s.io

charts/templates/deployment.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
labels:
5-
app.kubernetes.io/name: api7-ingress
6-
control-plane: controller-manager
5+
{{- include "api7-ingress-controller-manager.labels" . | nindent 4 }}
76
name: {{ .Release.Name }}
87
namespace: {{ .Release.Namespace }}
98
spec:
109
replicas: {{ .Values.replicas }}
1110
selector:
1211
matchLabels:
13-
control-plane: controller-manager
12+
{{- include "api7-ingress-controller-manager.selectorLabels" . | nindent 6 }}
1413
template:
1514
metadata:
1615
annotations:
1716
kubectl.kubernetes.io/default-container: manager
1817
labels:
19-
control-plane: controller-manager
18+
{{- include "api7-ingress-controller-manager.selectorLabels" . | nindent 8 }}
2019
spec:
2120
containers:
2221
- image: "api7/api7-ingress-controller:{{ .Values.imageTag }}"

charts/templates/role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: Role
33
metadata:
44
labels:
5-
app.kubernetes.io/name: api7-ingress
5+
{{- include "api7-ingress-controller-manager.labels" . | nindent 4 }}
66
name: api7-ingress-leader-election-role
77
namespace: {{ .Release.Namespace }}
88
rules:

charts/templates/role_binding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
22
kind: RoleBinding
33
metadata:
44
labels:
5-
app.kubernetes.io/name: api7-ingress
5+
{{- include "api7-ingress-controller-manager.labels" . | nindent 4 }}
66
name: api7-ingress-leader-election-rolebinding
77
namespace: {{ .Release.Namespace }}
88
roleRef:

charts/templates/service-account.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ apiVersion: v1
22
kind: ServiceAccount
33
metadata:
44
labels:
5-
app.kubernetes.io/name: api7-ingress
5+
{{- include "api7-ingress-controller-manager.labels" . | nindent 4 }}
66
name: {{ .Release.Name }}
77
namespace: {{ .Release.Namespace }}

charts/templates/service.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ apiVersion: v1
22
kind: Service
33
metadata:
44
labels:
5-
app.kubernetes.io/name: api7-ingress
6-
control-plane: controller-manager
5+
{{- include "api7-ingress-controller-manager.labels" . | nindent 4 }}
76
name: {{ .Release.Name }}-metrics-service
87
namespace: {{ .Release.Namespace }}
98
spec:
@@ -13,4 +12,4 @@ spec:
1312
protocol: TCP
1413
targetPort: 8443
1514
selector:
16-
control-plane: controller-manager
15+
{{- include "api7-ingress-controller-manager.selectorLabels" . | nindent 4 }}

0 commit comments

Comments
 (0)