Skip to content

Commit d0c94de

Browse files
pinkavajpinkavaj
committed
Use labels suggested by K8s and Helm best practices
Many tools can benefit from using those labels, providing either extra information or simplifying life of many by unifying the labels zoo.
1 parent 60cac04 commit d0c94de

14 files changed

+32
-60
lines changed

‎templates/_helpers.tpl‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
3939
value: "/auth/htpasswd"
4040
{{- end }}
4141

42+
{{- define "docker-registry.match-labels" -}}
43+
app.kubernetes.io/name: {{ template "docker-registry.name" . }}
44+
app.kubernetes.io/instance: {{ .Release.Name | quote }}
45+
{{- end -}}
46+
47+
{{- define "docker-registry.labels" -}}
48+
{{ include "docker-registry.match-labels" . }}
49+
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
50+
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
51+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
52+
{{- end -}}
53+
4254
{{- if .Values.tlsSecretName }}
4355
- name: REGISTRY_HTTP_TLS_CERTIFICATE
4456
value: /etc/ssl/docker/tls.crt

‎templates/configmap.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ metadata:
44
name: {{ template "docker-registry.fullname" . }}-config
55
namespace: {{ .Values.namespace | default .Release.Namespace }}
66
labels:
7-
app: {{ template "docker-registry.name" . }}
8-
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
9-
heritage: {{ .Release.Service }}
10-
release: {{ .Release.Name }}
7+
{{ include "docker-registry.labels" . | nindent 4 }}
118
data:
129
config.yml: |-
1310
{{ toYaml .Values.configData | indent 4 }}

‎templates/cronjob.yaml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@ metadata:
55
name: {{ template "docker-registry.fullname" . }}-garbage-collector
66
namespace: {{ .Values.namespace | default .Release.Namespace }}
77
labels:
8-
app: {{ template "docker-registry.name" . }}
9-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
10-
release: {{ .Release.Name }}
11-
heritage: {{ .Release.Service }}
8+
{{ include "docker-registry.labels" . | nindent 4 }}
129
spec:
1310
schedule: {{ .Values.garbageCollect.schedule | quote }}
1411
jobTemplate:
1512
metadata:
1613
labels:
17-
app: {{ template "docker-registry.name" . }}
18-
release: {{ .Release.Name }}
14+
{{ include "docker-registry.labels" . | nindent 8 }}
1915
{{- with .Values.podLabels }}
2016
{{- toYaml . | nindent 8 }}
2117
{{- end }}
@@ -29,7 +25,7 @@ spec:
2925
template:
3026
metadata:
3127
labels:
32-
release: {{ .Release.Name }}
28+
{{ include "docker-registry.labels" . | nindent 12 }}
3329
{{- if or .Values.podLabels .Values.garbageCollect.podLabels }}
3430
{{- toYaml (merge (.Values.garbageCollect.podLabels | default (dict)) (.Values.podLabels | default (dict))) | nindent 12 }}
3531
{{- end }}

‎templates/deployment.yaml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,15 @@ metadata:
44
name: {{ template "docker-registry.fullname" . }}
55
namespace: {{ .Values.namespace | default .Release.Namespace }}
66
labels:
7-
app: {{ template "docker-registry.name" . }}
8-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
9-
release: {{ .Release.Name }}
10-
heritage: {{ .Release.Service }}
7+
{{ include "docker-registry.labels" . | nindent 4 }}
118
{{- if .Values.deployment.annotations }}
129
annotations:
1310
{{ toYaml .Values.deployment.annotations | indent 4 }}
1411
{{- end }}
1512
spec:
1613
selector:
1714
matchLabels:
18-
app: {{ template "docker-registry.name" . }}
19-
release: {{ .Release.Name }}
15+
{{ include "docker-registry.match-labels" . | nindent 6 }}
2016
replicas: {{ .Values.replicaCount }}
2117
{{- if .Values.updateStrategy }}
2218
strategy: {{ toYaml .Values.updateStrategy | nindent 4 }}
@@ -25,8 +21,7 @@ spec:
2521
template:
2622
metadata:
2723
labels:
28-
app: {{ template "docker-registry.name" . }}
29-
release: {{ .Release.Name }}
24+
{{ include "docker-registry.labels" . | nindent 8 }}
3025
{{- with .Values.podLabels }}
3126
{{ toYaml . | nindent 8 }}
3227
{{- end }}

‎templates/hpa.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ kind: HorizontalPodAutoscaler
66
metadata:
77
name: {{ template "docker-registry.fullname" . }}
88
labels:
9-
app: {{ template "docker-registry.name" . }}
10-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
11-
release: {{ .Release.Name }}
12-
heritage: {{ .Release.Service }}
9+
{{ include "docker-registry.labels" . | nindent 4 }}
1310
spec:
1411
scaleTargetRef:
1512
apiVersion: apps/v1

‎templates/hpaV1.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ kind: HorizontalPodAutoscaler
66
metadata:
77
name: {{ template "docker-registry.fullname" . }}
88
labels:
9-
app: {{ template "docker-registry.name" . }}
10-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
11-
release: {{ .Release.Name }}
12-
heritage: {{ .Release.Service }}
9+
{{ include "docker-registry.labels" . | nindent 4 }}
1310
spec:
1411
scaleTargetRef:
1512
apiVersion: apps/v1

‎templates/ingress.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ metadata:
99
name: {{ template "docker-registry.fullname" . }}
1010
namespace: {{ .Values.namespace | default .Release.Namespace }}
1111
labels:
12-
app: {{ template "docker-registry.name" . }}
13-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
14-
release: {{ .Release.Name }}
15-
heritage: {{ .Release.Service }}
12+
{{ include "docker-registry.labels" . | indent 4 }}
1613
{{- if .Values.ingress.labels }}
1714
{{ toYaml .Values.ingress.labels | indent 4 }}
1815
{{- end }}

‎templates/poddisruptionbudget.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,10 @@ metadata:
99
name: {{ template "docker-registry.fullname" . }}
1010
namespace: {{ .Values.namespace | default .Release.Namespace }}
1111
labels:
12-
app: {{ template "docker-registry.name" . }}
13-
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
14-
release: {{ .Release.Name }}
15-
heritage: {{ .Release.Service }}
12+
{{ include "docker-registry.labels" . | nindent 4 }}
1613
spec:
1714
selector:
1815
matchLabels:
19-
app: {{ template "docker-registry.name" . }}
20-
release: {{ .Release.Name }}
16+
{{ include "docker-registry.match-labels" . | indent 6 }}
2117
{{ toYaml .Values.podDisruptionBudget | indent 2 }}
2218
{{- end -}}

‎templates/prometheusrules.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
name: {{ template "docker-registry.fullname" . }}
66
labels:
77
app.kubernetes.io/component: controller
8+
{{ include "docker-registry.labels" . | nindent 4 }}
89
{{- if .Values.metrics.prometheusRule.labels }}
910
{{- toYaml .Values.metrics.prometheusRule.labels | nindent 4 }}
1011
{{- end }}

‎templates/pvc.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ metadata:
66
name: {{ template "docker-registry.fullname" . }}
77
namespace: {{ .Values.namespace | default .Release.Namespace }}
88
labels:
9-
app: {{ template "docker-registry.fullname" . }}
10-
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
11-
release: "{{ .Release.Name }}"
12-
heritage: "{{ .Release.Service }}"
9+
{{ include "docker-registry.labels" . | nindent 4 }}
1310
spec:
1411
accessModes:
1512
- {{ .Values.persistence.accessMode | quote }}

0 commit comments

Comments
 (0)