feat: add support for customizable deployment template labels

On-behalf-of: @SAP angel.kafazov@sap.com Signed-off-by: Angel Kafazov <akafazov@cst-bg.net>
openmfp · Nov 25, 2024 · 0e9cecb · 0e9cecb
1 parent 076cd6e
commit 0e9cecb
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 2 deletions.
diff --git a/charts/common/templates/_deploymentHelpers.tpl b/charts/common/templates/_deploymentHelpers.tpl
@@ -125,4 +125,7 @@ automountServiceAccountToken: {{ not (eq (.Values.security).mountServiceAccountT
 {{- end }}
 {{- define "common.terminationGracePeriodSeconds" -}}
 {{ .Values.terminationGracePeriodSeconds | default 10 }}
+{{- end }}
+{{- define "common.deploymentTemplateLabels" }}
+
 {{- end }}
diff --git a/charts/extension-manager-operator/charts/common-0.1.5.tgz b/charts/extension-manager-operator/charts/common-0.1.5.tgz
diff --git a/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.3.tgz b/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.3.tgz
diff --git a/charts/extension-manager-operator/templates/deployment.yaml b/charts/extension-manager-operator/templates/deployment.yaml
@@ -15,7 +15,9 @@ spec:
     metadata:
       labels:
         service: {{ include "common.entity.name" . }}
-        control-plane: controller-manager
+      {{- if ((.Values.deployment).template).labels }}
+      {{ .Values.deployment.template.labels | toYaml | nindent 8 }}
+      {{- end }}
       annotations:
         sidecar.istio.io/inject: "{{ (include "common.istioEnabled" .) }}"
     spec:

diff --git a/charts/extension-manager-operator/tests/__snapshot__/deployment_test.yaml.snap b/charts/extension-manager-operator/tests/__snapshot__/deployment_test.yaml.snap
@@ -71,7 +71,6 @@ operator match the snapshot:
           annotations:
             sidecar.istio.io/inject: "true"
           labels:
-            control-plane: controller-manager
             service: RELEASE-NAME-extension-manager-operator
         spec:
           containers:

diff --git a/charts/extension-manager-operator/tests/deployment_test.yaml b/charts/extension-manager-operator/tests/deployment_test.yaml
@@ -40,3 +40,24 @@ tests:
               path: /healthz
               port: 8081
             periodSeconds: 10
+  - it: check deployment template labels
+    template: deployment.yaml
+    set:
+      deployment:
+        template:
+          labels:
+            control-plane: controller-manager
+    asserts:
+      - equal:
+          path: spec.template.metadata.labels.control-plane
+          value: controller-manager
+  - it: check deployment without custom labels
+    template: deployment.yaml
+    set:
+      deployment:
+        template: {}
+    asserts:
+      - equal:
+          path: spec.template.metadata.labels
+          value:
+            service: RELEASE-NAME-extension-manager-operator
diff --git a/charts/extension-manager-operator/values.yaml b/charts/extension-manager-operator/values.yaml
@@ -54,6 +54,9 @@ deployment:
     requests:
       cpu: 150m
       memory: 128Mi
+  template:
+    # labels:
+    #   control-plane: controller-manager
 
 # The Custom Resource Definitions (CRDs) configuration
 ## @param crds.enabled Enable or disable the CRDs