revert unneeded polishing of charts

Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
keptn · Apr 19, 2024 · eb2745f · eb2745f
1 parent 27f312c
commit eb2745f
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 6 deletions.
diff --git a/.github/scripts/.helm-tests/certificates-only/result.yaml b/.github/scripts/.helm-tests/certificates-only/result.yaml
@@ -174,6 +174,9 @@ metadata:
   name: certificate-operator-leader-election-rolebinding
   namespace: "helmtests"
   labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: certificate-operator
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager

diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml
@@ -14848,6 +14848,9 @@ metadata:
   name: keptn-scheduler-leader-election-role
   namespace: "helmtests"
   labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: scheduler
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
@@ -14938,6 +14941,9 @@ metadata:
   name: certificate-operator-leader-election-rolebinding
   namespace: "helmtests"
   labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: certificate-operator
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager

diff --git a/.github/scripts/.helm-tests/lifecycle-only/result.yaml b/.github/scripts/.helm-tests/lifecycle-only/result.yaml
@@ -11689,6 +11689,9 @@ metadata:
   name: keptn-scheduler-leader-election-role
   namespace: "helmtests"
   labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: scheduler
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator

diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
@@ -11857,6 +11857,9 @@ metadata:
   name: keptn-scheduler-leader-election-role
   namespace: "helmtests"
   labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: scheduler
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
@@ -11902,6 +11905,9 @@ metadata:
   name: certificate-operator-leader-election-rolebinding
   namespace: "helmtests"
   labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: certificate-operator
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager

diff --git a/.github/scripts/.helm-tests/local-global-precedence/result.yaml b/.github/scripts/.helm-tests/local-global-precedence/result.yaml
@@ -26,6 +26,10 @@ kind: ServiceAccount
 metadata:
   name: keptn-scheduler
   namespace: "helmtests"
+  annotations:
+    globalAnnotation1: test1
+    globalAnnotation2: test2
+    test-annotation: local
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -34,9 +38,6 @@ metadata:
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: lifecycle-operator-0.2.3
-    globalAnnotation1: test1
-    globalAnnotation2: test2
-    test-annotation: local
 ---
 # Source: keptn/charts/lifecycleOperator/templates/deployment.yaml
 apiVersion: v1
@@ -15077,6 +15078,9 @@ metadata:
     globalAnnotation2: test2
     test-annotation: local
   labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: scheduler
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
@@ -15179,13 +15183,19 @@ metadata:
     globalAnnotation2: test2
     test-annotation: local
   labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: certificate-operator
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
     app.kubernetes.io/version: v2.1.1
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: cert-manager-0.2.3
+    globalAnnotation1: test1
+    globalAnnotation2: test2
+    test-annotation: local
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml
@@ -3210,6 +3210,9 @@ metadata:
   name: certificate-operator-leader-election-rolebinding
   namespace: "helmtests"
   labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: certificate-operator
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager

diff --git a/keptn-cert-manager/chart/templates/certificate-operator-leader-election-rbac.yaml b/keptn-cert-manager/chart/templates/certificate-operator-leader-election-rbac.yaml
@@ -47,11 +47,16 @@ kind: RoleBinding
 metadata:
   name: certificate-operator-leader-election-rolebinding
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
   {{- with $annotations }}
-  annotations: {{- . -}}
+  annotations: {{- . }}
   {{- end }}
   labels:
-{{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: certificate-operator
+    app.kubernetes.io/part-of: keptn
+    {{- include "common.labels.standard" (dict "context" .) | nindent 4 }}
+    {{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/lifecycle-operator/chart/templates/deployment.yaml b/lifecycle-operator/chart/templates/deployment.yaml
@@ -5,9 +5,12 @@ kind: ServiceAccount
 metadata:
   name: keptn-scheduler
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 {{- end }}
 ---
 apiVersion: v1

diff --git a/lifecycle-operator/chart/templates/scheduler-leader-election-rbac.yaml b/lifecycle-operator/chart/templates/scheduler-leader-election-rbac.yaml
@@ -8,6 +8,9 @@ metadata:
   annotations: {{- . -}}
   {{- end }}
   labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: scheduler
+    app.kubernetes.io/part-of: keptn
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
 rules:
 - apiGroups: