From 583d2882733d7add5776dd130bf0828203bc49ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20Echterh=C3=B6lter?=
 <bastian.echterhoelter@sap.com>
Date: Tue, 19 Nov 2024 10:53:43 +0100
Subject: [PATCH] feat: adjust to not disable proxy injection by default as
 this is needed for the fga communication

---
 charts/account-operator/Chart.yaml                     |  2 +-
 charts/account-operator/templates/deployment.yaml      | 10 ++++++++--
 .../tests/__snapshot__/deployment_test.yaml.snap       |  6 ------
 charts/account-operator/values.yaml                    |  5 +++++
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/charts/account-operator/Chart.yaml b/charts/account-operator/Chart.yaml
index 6852defa5..9041c8f8d 100644
--- a/charts/account-operator/Chart.yaml
+++ b/charts/account-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: account-operator
 description: A Helm chart for Kubernetes
 type: application
-version: 0.3.1
+version: 0.4.0
 appVersion: "0.95.0"
 dependencies:
   - name: account-operator-crds
diff --git a/charts/account-operator/templates/deployment.yaml b/charts/account-operator/templates/deployment.yaml
index 0c5aef631..e6939a6d0 100644
--- a/charts/account-operator/templates/deployment.yaml
+++ b/charts/account-operator/templates/deployment.yaml
@@ -12,9 +12,15 @@ spec:
     metadata:
       labels:
         service: {{ include "entity.name" . }}
-        control-plane: controller-manager
+        {{- with .Values.deployment.specTemplate.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{ if .Values.deployment.specTemplate.annotations }}
       annotations:
-        sidecar.istio.io/inject: "false"
+        {{- with .Values.deployment.specTemplate.annotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- end }}
     spec:
       serviceAccountName: {{ include "entity.name" . }}
       containers:
diff --git a/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap b/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap
index 3778450ff..c6ea61664 100644
--- a/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap
+++ b/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap
@@ -81,10 +81,7 @@ operator match the snapshot:
           service: RELEASE-NAME-account-operator
       template:
         metadata:
-          annotations:
-            sidecar.istio.io/inject: "false"
           labels:
-            control-plane: controller-manager
             service: RELEASE-NAME-account-operator
         spec:
           containers:
@@ -240,10 +237,7 @@ operator match the snapshot (with kubeconfigSecret):
           service: RELEASE-NAME-account-operator
       template:
         metadata:
-          annotations:
-            sidecar.istio.io/inject: "false"
           labels:
-            control-plane: controller-manager
             service: RELEASE-NAME-account-operator
         spec:
           containers:
diff --git a/charts/account-operator/values.yaml b/charts/account-operator/values.yaml
index ff101127f..67fca6729 100644
--- a/charts/account-operator/values.yaml
+++ b/charts/account-operator/values.yaml
@@ -14,6 +14,9 @@ metrics:
   port: 8080
 
 deployment:
+  specTemplate:
+    annotations: {}
+    labels: {}
   revisionHistoryLimit: 3
   resources:
     limits:
@@ -23,6 +26,8 @@ deployment:
       cpu: 150m
       memory: 128Mi
 
+
+
 kcp:
   enabled: false
   virtualWorkspaceUrl: ""