diff --git a/charts/redis-ha/templates/redis-ha-configmap.yaml b/charts/redis-ha/templates/redis-ha-configmap.yaml index 48f2b03..0b9aea0 100644 --- a/charts/redis-ha/templates/redis-ha-configmap.yaml +++ b/charts/redis-ha/templates/redis-ha-configmap.yaml @@ -4,10 +4,7 @@ metadata: name: {{ template "redis-ha.fullname" . }}-configmap namespace: {{ .Release.Namespace | quote }} labels: - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - app: {{ template "redis-ha.fullname" . }} +{{ include "labels.standard" . | indent 4 }} {{- range $key, $value := .Values.configmap.labels }} {{ $key }}: {{ $value | toString }} {{- end }} diff --git a/charts/redis-ha/templates/redis-ha-health-configmap.yaml b/charts/redis-ha/templates/redis-ha-health-configmap.yaml index 7aa7002..b9b1131 100644 --- a/charts/redis-ha/templates/redis-ha-health-configmap.yaml +++ b/charts/redis-ha/templates/redis-ha-health-configmap.yaml @@ -4,10 +4,7 @@ metadata: name: {{ template "redis-ha.fullname" . }}-health-configmap namespace: {{ .Release.Namespace | quote }} labels: - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - app: {{ template "redis-ha.fullname" . }} +{{ include "labels.standard" . | indent 4 }} {{- range $key, $value := .Values.extraLabels }} {{ $key }}: {{ $value | quote }} {{- end }} diff --git a/charts/redis-ha/templates/redis-ha-secret.yaml b/charts/redis-ha/templates/redis-ha-secret.yaml index 91cc7f2..6a03a7e 100644 --- a/charts/redis-ha/templates/redis-ha-secret.yaml +++ b/charts/redis-ha/templates/redis-ha-secret.yaml @@ -11,10 +11,7 @@ metadata: name: {{ include "redis-ha.fullname" . }}-secret namespace: {{ .Release.Namespace | quote }} labels: - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - app: {{ template "redis-ha.fullname" . }} +{{ include "labels.standard" . | indent 4 }} {{- range $key, $value := .Values.extraLabels }} {{ $key }}: {{ $value | quote }} {{- end }} @@ -29,4 +26,4 @@ data: {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/redis-ha/templates/redis-ha-serviceaccount.yaml b/charts/redis-ha/templates/redis-ha-serviceaccount.yaml index d28a9d0..992e385 100644 --- a/charts/redis-ha/templates/redis-ha-serviceaccount.yaml +++ b/charts/redis-ha/templates/redis-ha-serviceaccount.yaml @@ -5,10 +5,7 @@ metadata: name: {{ template "redis-ha.serviceAccountName" . }} namespace: {{ .Release.Namespace | quote }} labels: - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - app: {{ template "redis-ha.fullname" . }} +{{ include "labels.standard" . | indent 4 }} {{- range $key, $value := .Values.extraLabels }} {{ $key }}: {{ $value | quote }} {{- end }} diff --git a/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml b/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml index f016855..8b3cb44 100644 --- a/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml +++ b/charts/redis-ha/templates/redis-haproxy-serviceaccount.yaml @@ -5,10 +5,7 @@ metadata: name: {{ template "redis-ha.serviceAccountName" . }}-haproxy namespace: {{ .Release.Namespace | quote }} labels: - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} - chart: {{ .Chart.Name }}-{{ .Chart.Version }} - app: {{ template "redis-ha.fullname" . }} +{{ include "labels.standard" . | indent 4 }} {{- range $key, $value := .Values.extraLabels }} {{ $key }}: {{ $value | quote }} {{- end }}