Remove duplicated label in helm chart: app.kubernetes.io/instance (#354)

* R  templates/certmanager/certifacate.yaml -> templates/certmanager/certificate.yaml
M  templates/manager/deployment.yaml Edit#481

* M  lws/templates/_helpers.tpl Edit#482

charts/lws/templates/_helpers.tpl

@@ -35,7 +35,7 @@ Common labels
 */}}
 {{- define "lws.labels" -}}
 helm.sh/chart: {{ include "lws.chart" . }}
-{{ include "lws.selectorLabels" . }}
+{{ include "lws.nameLabel" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -46,7 +46,21 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Selector labels
 */}}
 {{- define "lws.selectorLabels" -}}
+{{ include "lws.nameLabel" . }}
+{{ include "lws.instanceLabel" . }}
+{{- end }}
+
+{{/*
+Name label
+*/}}
+{{- define "lws.nameLabel" -}}
 app.kubernetes.io/name: {{ include "lws.name" . }}
+{{- end }}
+
+{{/*
+Instance label
+*/}}
+{{- define "lws.instanceLabel" -}}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 

charts/lws/templates/manager/deployment.yaml

@@ -6,6 +6,8 @@ metadata:
   labels:
     control-plane: controller-manager
     {{- include "lws.labels" . | nindent 4 }}
+    {{- include "lws.instanceLabel" . | nindent 4 }}
+
 spec:
   replicas: {{ .Values.replicaCount }}
   selector: