Adapt labels to kubernetes standard

charts/cadvisor/templates/_helpers.tpl

@@ -41,6 +41,9 @@ helm.sh/chart: {{ include "cadvisor.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.commonLabels }}
+{{ toYaml .Values.commonLabels }}
+{{- end }}
 {{- end -}}
 
 {{/*

charts/cadvisor/templates/clusterrole.yaml

@@ -4,6 +4,8 @@ kind: ClusterRole
 metadata:
   name: {{ template "cadvisor.name" . }}
   namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "cadvisor.labels" . | nindent 4}}
 rules:
   - apiGroups: ['policy']
     resources: ['podsecuritypolicies']

charts/cadvisor/templates/clusterrolebinding.yaml

@@ -4,6 +4,8 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ template "cadvisor.name" . }}
   namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "cadvisor.labels" . | nindent 4}}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

charts/cadvisor/templates/daemonset.yaml

@@ -8,20 +8,15 @@ metadata:
 {{ toYaml . | indent 4 }}
   {{- end }}
   labels:
-    app: {{ template "cadvisor.name" . }}
+    {{- include "cadvisor.labels" . | nindent 4}}
-    chart: {{ template "cadvisor.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
 spec:
   selector:
     matchLabels:
-      app: {{ template "cadvisor.name" . }}
+      {{- include "cadvisor.selectorLabels" . | nindent 6 }}
-      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ template "cadvisor.name" . }}
+        {{- include "cadvisor.selectorLabels" . | nindent 8 }}
-        release: {{ .Release.Name }}
         {{- range $key, $value := .Values.podLabels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
@@ -30,17 +25,17 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
-      {{ if .Values.priorityClassName }}
+      {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}
-      {{ if .Values.image.pullSecrets }}
+      {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
       {{- range .Values.image.pullSecrets }}
       - name: {{ . }}
       {{- end }}
       {{- end }}
       serviceAccountName: {{ template "cadvisor.serviceAccountName" . }}
-      {{ if .Values.hostNetwork }} 
+      {{- if .Values.hostNetwork }} 
       hostNetwork: true
       {{- end }}
       containers:
@@ -57,7 +52,7 @@ spec:
           mountPath: {{ default .path .mount }}
           readOnly: {{ list nil true | has .readOnly }}
         {{- end }}
-        {{ if .Values.podSecurityContext.create }}
+        {{- if .Values.podSecurityContext.create }}
         securityContext:
           privileged: {{ .Values.podSecurityContext.privileged }}
         {{- end }}

charts/cadvisor/templates/psp.yaml

@@ -4,6 +4,8 @@ kind: PodSecurityPolicy
 metadata:
   name: {{ template "cadvisor.name" . }}
   namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "cadvisor.labels" . | nindent 4}}
 spec:
   seLinux:
     rule: RunAsAny

charts/cadvisor/templates/service.yaml

@@ -4,10 +4,7 @@ metadata:
   name: {{ template "cadvisor.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "cadvisor.name" . }}
+    {{- include "cadvisor.labels" . | nindent 4}}
-    chart: {{ template "cadvisor.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
 spec:
   ports:
   - name: http
@@ -15,5 +12,5 @@ spec:
     targetPort: {{ .Values.container.port }}
     protocol: TCP
   selector:
-    app: {{ template "cadvisor.name" . }}
+    {{- include "cadvisor.selectorLabels" . | nindent 4 }}
   type: ClusterIP

charts/cadvisor/templates/serviceaccount.yaml

@@ -4,4 +4,6 @@ kind: ServiceAccount
 metadata:
   name: {{ template "cadvisor.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "cadvisor.labels" . | nindent 4 }}
 {{- end -}}

charts/cadvisor/templates/servicemonitor.yaml

@@ -5,10 +5,7 @@ metadata:
   name: {{ template "cadvisor.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "cadvisor.name" . }}
+    {{- include "cadvisor.labels" . | nindent 4}}
-    chart: {{ template "cadvisor.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
 spec:
   selector:
     matchLabels:
@@ -30,3 +27,4 @@ spec:
         {{- toYaml .Values.metrics.metricRelabelings | nindent 8 }}
       {{- end -}}
 {{- end -}}
+

charts/cadvisor/values.yaml

@@ -49,6 +49,7 @@ resources: {}
 
 podAnnotations: {}
 podLabels: {}
+commonLabels: {}
 
 daemonsetAnnotations:
   seccomp.security.alpha.kubernetes.io/pod: 'docker/default'