diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 830924a..7c4423e 100644 --- a/chart/templates/_helpers.tpl +++ b/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 }} diff --git a/chart/templates/clusterrole.yaml b/chart/templates/clusterrole.yaml index fea36e4..14e2bef 100644 --- a/chart/templates/clusterrole.yaml +++ b/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"] diff --git a/chart/templates/clusterrolebinding.yaml b/chart/templates/clusterrolebinding.yaml index 0a0ff25..bd91fc4 100644 --- a/chart/templates/clusterrolebinding.yaml +++ b/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 diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 0c7108d..b9f6082 100644 --- a/chart/templates/deployment.yaml +++ b/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: