From 63ea0fbc219122597ab4f136b807cf586ce828b1 Mon Sep 17 00:00:00 2001
From: skrishnan-sap <139535827+skrishnan-sap@users.noreply.github.com>
Date: Wed, 2 Oct 2024 15:31:03 +0200
Subject: [PATCH] [FIX] remove incompatible selector change in chart (#88)

---
 chart/Chart.yaml                           | 2 +-
 chart/templates/controller-deployment.yaml | 3 ---
 chart/templates/server-deployment.yaml     | 3 ---
 chart/templates/webhook-deployment.yaml    | 3 ---
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 74fbd43..1314d92 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
 description: Helm chart to deploy CAP Operator https://sap.github.io/cap-operator/
 name: cap-operator
-version: 0.10.1
+version: 0.10.2
 appVersion: 0.10.0
diff --git a/chart/templates/controller-deployment.yaml b/chart/templates/controller-deployment.yaml
index 7616929..d914c62 100644
--- a/chart/templates/controller-deployment.yaml
+++ b/chart/templates/controller-deployment.yaml
@@ -13,9 +13,6 @@ spec:
       operator.sme.sap.com/app: controller
       operator.sme.sap.com/category: controller
       operator.sme.sap.com/release: {{.Release.Name}}
-      {{- if or (gt (len .Values.podLabels) 0) (gt (len .Values.controller.podLabels) 0) }}
-      {{- include "utils.maps.merge" (list .Values.podLabels .Values.controller.podLabels) | trim | nindent 6 }}
-      {{- end }}
   template:
     metadata:
       labels:
diff --git a/chart/templates/server-deployment.yaml b/chart/templates/server-deployment.yaml
index cd7df03..98b6713 100644
--- a/chart/templates/server-deployment.yaml
+++ b/chart/templates/server-deployment.yaml
@@ -14,9 +14,6 @@ spec:
       operator.sme.sap.com/app: subscription-server
       operator.sme.sap.com/category: controller
       operator.sme.sap.com/release: {{.Release.Name}}
-      {{- if or (gt (len .Values.podLabels) 0) (gt (len .Values.subscriptionServer.podLabels) 0) }}
-      {{- include "utils.maps.merge" (list .Values.podLabels .Values.subscriptionServer.podLabels) | trim | nindent 6 }}
-      {{- end }}
   template:
     metadata:
       labels:
diff --git a/chart/templates/webhook-deployment.yaml b/chart/templates/webhook-deployment.yaml
index 70dd5f5..e0f1907 100644
--- a/chart/templates/webhook-deployment.yaml
+++ b/chart/templates/webhook-deployment.yaml
@@ -14,9 +14,6 @@ spec:
       operator.sme.sap.com/app: webhook
       operator.sme.sap.com/category: controller
       operator.sme.sap.com/release: {{.Release.Name}}
-      {{- if or (gt (len .Values.podLabels) 0) (gt (len .Values.webhook.podLabels) 0) }}
-      {{- include "utils.maps.merge" (list .Values.podLabels .Values.webhook.podLabels) | trim | nindent 6 }}
-      {{- end }}
   template:
     metadata:
       labels: