Fix Deployment labels / selectorLabels | generic 1.8.0

Author: dbpolito

charts/generic/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v2
 name: generic
 description: Generic Chart
-version: 1.7.0
+version: 1.8.0

charts/generic/templates/_helpers.tpl

@@ -36,19 +36,26 @@ Common labels
 */}}
 {{- define "generic.labels" -}}
 helm.sh/chart: {{ include "generic.chart" . }}
-{{ include "generic.selectorLabels" . }}
+app.kubernetes.io/name: {{ include "generic.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
+{{- define "generic.deploymentLabels" -}}
+{{- include "generic.labels" . }}
+app.kubernetes.io/deployment: {{ include "generic.name" . }}
+{{- end }}
+
 {{/*
 Selector labels
 */}}
 {{- define "generic.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "generic.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/deployment: {{ include "generic.name" . }}
 {{- end }}
 
 {{/*

charts/generic/templates/deployment.yaml

@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ $fullName }}
-  labels: {{ include "generic.labels" $ | nindent 4 }}
+  labels: {{ include "generic.deploymentLabels" $ | nindent 4 }}
   {{- with .annotations }}
   annotations: {{ toYaml . | nindent 4 }}
   {{- end }}