modify existing templates to use the label helper

Author: webdz9r

chart/templates/_helpers.tpl

@@ -36,7 +36,6 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "k8s-event-logger.labels" -}}
-app.kubernetes.io/name: {{ include "k8s-event-logger.name" . }}
 helm.sh/chart: {{ include "k8s-event-logger.chart" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Chart.AppVersion }}

chart/templates/clusterrole.yaml

@@ -4,9 +4,7 @@ metadata:
   name: {{ include "k8s-event-logger.fullname" . }}
   labels:
     app.kubernetes.io/name: {{ include "k8s-event-logger.name" . }}
-    helm.sh/chart: {{ include "k8s-event-logger.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "k8s-event-logger.labels" . | nindent 4 }}
 rules:
 - apiGroups: [""]
   resources: ["events"]

chart/templates/clusterrolebinding.yaml

@@ -4,9 +4,7 @@ metadata:
   name: {{ include "k8s-event-logger.fullname" . }}
   labels:
     app.kubernetes.io/name: {{ include "k8s-event-logger.name" . }}
-    helm.sh/chart: {{ include "k8s-event-logger.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "k8s-event-logger.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

chart/templates/deployment.yaml

@@ -4,7 +4,8 @@ metadata:
   name: {{ include "k8s-event-logger.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-{{ include "k8s-event-logger.labels" . | indent 4 }}
+    app.kubernetes.io/name: {{ include "k8s-event-logger.name" . }}
+    {{- include "k8s-event-logger.labels" . | nindent 4 }}
 spec:
   replicas: 1
   selector: