fix(installer): Revert immutable k8s labels (#8213)

Co-authored-by: RealAnna <[email protected]>

.gitignore

@@ -19,3 +19,6 @@ vendor/*
 
 #binary - go build
 helm-service
+
+chart/charts/*.tgz
+chart/Chart.lock

chart/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 Expand the name of the chart.
 */}}
 {{- define "helm-service.name" -}}
-{{- include "common.names.name" . -}}
+{{- include "keptn.common.names.name" . -}}
 {{- end }}
 
 {{/*
@@ -11,14 +11,14 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "helm-service.fullname" -}}
-{{- include "common.names.fullname" . -}}
+{{- include "keptn.common.names.fullname" . -}}
 {{- end }}
 
 {{/*
 Create chart name and version as used by the chart label.
 */}}
 {{- define "helm-service.chart" -}}
-{{- include "common.names.chart" . -}}
+{{- include "keptn.common.names.chart" . -}}
 {{- end }}
 
 {{/*

chart/templates/deployment.yaml

@@ -2,21 +2,21 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "helm-service.fullname" . }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    app.kubernetes.io/component: helm-service
+  labels: {{- include "keptn.common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/name: helm-service
 spec:
   replicas: 1
   selector:
-    matchLabels: {{- include "common.labels.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: helm-service
+    matchLabels: {{- include "keptn.common.labels.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: helm-service
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      labels: {{- include "common.labels.standard" . | nindent 8 }}
-        app.kubernetes.io/component: helm-service
+      labels: {{- include "keptn.common.labels.standard" . | nindent 8 }}
+        app.kubernetes.io/name: helm-service
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -137,10 +137,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.labels['app.kubernetes.io/name']
-            - name: K8S_DEPLOYMENT_COMPONENT
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.labels['app.kubernetes.io/component']
             - name: K8S_POD_NAME
               valueFrom:
                 fieldRef:

chart/templates/service.yaml

@@ -3,13 +3,13 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "helm-service.fullname" . }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    app.kubernetes.io/component: helm-service
+  labels: {{- include "keptn.common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/name: helm-service
 spec:
   type: ClusterIP
   ports:
     - port: 8080
       protocol: TCP
-  selector: {{- include "common.labels.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: helm-service
+  selector: {{- include "keptn.common.labels.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/name: helm-service
   {{- end }}

chart/templates/serviceaccount.yaml

@@ -2,8 +2,8 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "helm-service.serviceAccountName" . }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    app.kubernetes.io/component: helm-service
+  labels: {{- include "keptn.common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/name: helm-service
   {{- with .Values.serviceAccount.annotations }}
   annotations:
   {{- toYaml . | nindent 4 }}
@@ -14,8 +14,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: keptn-{{ .Release.Namespace }}-helm-service-cluster-admin
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    app.kubernetes.io/component: helm-service
+  labels: {{- include "keptn.common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/name: helm-service
   {{- with .Values.serviceAccount.annotations }}
   annotations:
   {{- toYaml . | nindent 4 }}

chart/templates/tests/test-api-connection.yaml

@@ -3,8 +3,8 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: "{{ include "helm-service.fullname" . }}-test-api-connection"
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    app.kubernetes.io/component: helm-service
+  labels: {{- include "keptn.common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/name: helm-service
   annotations:
     "helm.sh/hook": test
 spec: