Use _helpers.tpl for global labels

Author: brookelew

chart/kube-flannel/templates/_helpers.tpl

@@ -0,0 +1,8 @@
+{{/* Labels common to all resources */}}
+{{- define "flannel.labels" -}}
+app: {{ .Chart.Name | quote }}
+tier: node
+{{- with .Values.global.commonLabels }}
+{{ toYaml . }}
+{{- end }}
+{{- end -}}

chart/kube-flannel/templates/config.yaml

@@ -4,9 +4,8 @@ metadata:
   name: kube-flannel-cfg
   namespace: {{ .Release.Namespace }}
   labels:
-    tier: node
-    app: flannel
-    {{- with merge .Values.flannel.configMap.labels .Values.global.commonLabels }}
+    {{- include "flannel.labels" . | nindent 4 }}
+    {{- with .Values.flannel.configMap.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- with merge .Values.flannel.configMap.annotations .Values.global.commonAnnotations }}

chart/kube-flannel/templates/daemonset.yaml

@@ -4,9 +4,8 @@ metadata:
   name: kube-flannel-ds
   namespace: {{ .Release.Namespace }}
   labels:
-    tier: node
-    app: flannel
-    {{- with merge .Values.flannel.daemonSet.labels .Values.global.commonLabels }}
+    {{- include "flannel.labels" . | nindent 4 }}
+    {{- with .Values.flannel.daemonSet.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- with merge .Values.flannel.daemonSet.annotations .Values.global.commonAnnotations }}
@@ -16,13 +15,12 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: flannel
+      {{- include "flannel.labels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        tier: node
-        app: flannel
-        {{- with merge .Values.flannel.podLabels .Values.global.commonLabels }}
+        {{- include "flannel.labels" . | nindent 8 }}
+        {{- with .Values.flannel.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
       {{- with merge .Values.flannel.podAnnotations .Values.global.commonAnnotations }}

chart/kube-flannel/templates/rbac.yaml

@@ -3,7 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: flannel
   labels:
-    {{- with (merge .Values.flannel.rbac.clusterRole.labels .Values.flannel.rbac.labels .Values.global.commonLabels) }}
+    {{- include "flannel.labels" . | nindent 4 }}
+    {{- with (merge .Values.flannel.rbac.clusterRole.labels .Values.flannel.rbac.labels) }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- with (merge .Values.flannel.rbac.clusterRole.annotations .Values.flannel.rbac.annotations .Values.global.commonAnnotations) }}
@@ -50,7 +51,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: flannel
   labels:
-    {{- with (merge .Values.flannel.rbac.clusterRoleBinding.labels .Values.flannel.rbac.labels .Values.global.commonLabels) }}
+    {{- include "flannel.labels" . | nindent 4 }}
+    {{- with (merge .Values.flannel.rbac.clusterRoleBinding.labels .Values.flannel.rbac.labels) }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- with (merge .Values.flannel.rbac.clusterRoleBinding.annotations .Values.flannel.rbac.annotations .Values.global.commonAnnotations) }}

chart/kube-flannel/templates/serviceaccount.yaml

@@ -3,10 +3,11 @@ kind: ServiceAccount
 metadata:
   name: flannel
   namespace: {{ .Release.Namespace }}
-  {{- with merge .Values.flannel.serviceAccount.labels .Values.global.commonLabels }}
   labels:
+    {{- include "flannel.labels" . | nindent 4 }}
+    {{- with .Values.flannel.serviceAccount.labels }}
     {{- toYaml . | nindent 4 }}
-  {{- end }}
+    {{- end }}
   {{- with merge .Values.flannel.serviceAccount.annotations .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}