Remove all unwanted labels "app: {{ include "webhook.name" . }}"

maelvls · maelvls · commit 489a57b7d111 · 2021-03-11T09:16:53.000+01:00
Signed-off-by: Maël Valais &lt;mael@vls.dev&gt;
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/cainjector-deployment.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/cainjector-deployment.yaml
@@ -5,7 +5,6 @@ metadata:
   name: {{ include "cainjector.fullname" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: {{ include "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -29,7 +28,6 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ include "cainjector.name" . }}
         app.kubernetes.io/name: {{ include "cert-manager.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/cainjector-psp-clusterrole.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/cainjector-psp-clusterrole.yaml
@@ -5,7 +5,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ template "cainjector.fullname" . }}-psp
   labels:
-    app: {{ include "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/cainjector-psp-clusterrolebinding.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/cainjector-psp-clusterrolebinding.yaml
@@ -5,7 +5,6 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ template "cainjector.fullname" . }}-psp
   labels:
-    app: {{ include "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/cainjector-psp.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/cainjector-psp.yaml
@@ -5,7 +5,6 @@ kind: PodSecurityPolicy
 metadata:
   name: {{ template "cainjector.fullname" . }}
   labels:
-    app: {{ include "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/cainjector-rbac.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/cainjector-rbac.yaml
@@ -5,7 +5,6 @@ kind: ClusterRole
 metadata:
   name: {{ template "cainjector.fullname" . }}
   labels:
-    app: {{ include "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -39,7 +38,6 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ template "cainjector.fullname" . }}
   labels:
-    app: {{ include "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -62,7 +60,6 @@ metadata:
   name: {{ template "cainjector.fullname" . }}:leaderelection
   namespace: {{ .Values.global.leaderElection.namespace }}
   labels:
-    app: {{ include "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -91,7 +88,6 @@ metadata:
   name: {{ include "cainjector.fullname" . }}:leaderelection
   namespace: {{ .Values.global.leaderElection.namespace }}
   labels:
-    app: {{ include "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/cainjector-serviceaccount.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/cainjector-serviceaccount.yaml
@@ -10,7 +10,6 @@ metadata:
 {{ toYaml .Values.cainjector.serviceAccount.annotations | indent 4 }}
   {{- end }}
   labels:
-    app: {{ include "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-deployment.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-deployment.yaml
@@ -4,7 +4,6 @@ metadata:
   name: {{ include "webhook.fullname" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -28,7 +27,6 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ include "webhook.name" . }}
         app.kubernetes.io/name: {{ include "cert-manager.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-mutating-webhook.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-mutating-webhook.yaml
@@ -9,7 +9,6 @@ kind: MutatingWebhookConfiguration
 metadata:
   name: {{ include "webhook.fullname" . }}
   labels:
-    app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-psp-clusterrole.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-psp-clusterrole.yaml
@@ -4,7 +4,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ template "webhook.fullname" . }}-psp
   labels:
-    app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-psp-clusterrolebinding.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-psp-clusterrolebinding.yaml
@@ -4,7 +4,6 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ template "webhook.fullname" . }}-psp
   labels:
-    app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-psp.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-psp.yaml
@@ -4,7 +4,6 @@ kind: PodSecurityPolicy
 metadata:
   name: {{ template "webhook.fullname" . }}
   labels:
-    app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-rbac.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-rbac.yaml
@@ -6,7 +6,6 @@ metadata:
   name: {{ template "webhook.fullname" . }}:dynamic-serving
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -30,7 +29,6 @@ metadata:
   name: {{ template "webhook.fullname" . }}:dynamic-serving
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-service.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-service.yaml
@@ -1,22 +1,21 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: { { template "webhook.fullname" . } }
-  namespace: { { .Release.Namespace | quote } }
+  name: {{ template "webhook.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
-    app: { { include "webhook.name" . } }
-    app.kubernetes.io/name: { { include "cert-manager.name" . } }
-    app.kubernetes.io/instance: { { .Release.Name } }
-    app.kubernetes.io/managed-by: { { .Release.Service } }
+    app.kubernetes.io/name: {{ include "cert-manager.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/component: "webhook"
-    helm.sh/chart: { { include "webhook.chart" . } }
+    helm.sh/chart: {{ include "webhook.chart" . }}
 spec:
   type: ClusterIP
   ports:
     - name: https
       port: 443
-      targetPort: { { .Values.webhook.securePort } }
+      targetPort: {{ .Values.webhook.securePort }}
   selector:
-    app.kubernetes.io/name: { { include "cert-manager.name" . } }
-    app.kubernetes.io/instance: { { .Release.Name } }
+    app.kubernetes.io/name: {{ include "cert-manager.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: "webhook"
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-serviceaccount.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-serviceaccount.yaml
@@ -9,7 +9,6 @@ metadata:
 {{ toYaml .Values.webhook.serviceAccount.annotations | indent 4 }}
   {{- end }}
   labels:
-    app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-validating-webhook.yaml b/chart/jetstack-secure-gcm/charts/cert-manager/templates/webhook-validating-webhook.yaml
@@ -9,7 +9,6 @@ kind: ValidatingWebhookConfiguration
 metadata:
   name: {{ include "webhook.fullname" . }}
   labels:
-    app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
