From a04b661ac9db2c3d59e1d6b33aa9b5461b81c848 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:57:28 +0100
Subject: [PATCH] feat: adjust to not disable proxy injection by default as
 this is needed for the fga communication (#11)

* feat: adjust to not disable proxy injection by default as this is needed for the fga communication

* fix: removing unreleated change

* fix: lint error
---
 charts/account-operator/Chart.yaml                       | 2 +-
 charts/account-operator/templates/deployment.yaml        | 9 ++++++++-
 .../tests/__snapshot__/deployment_test.yaml.snap         | 4 ----
 charts/account-operator/values.yaml                      | 3 +++
 4 files changed, 12 insertions(+), 6 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..6fe62b7a1 100644
--- a/charts/account-operator/templates/deployment.yaml
+++ b/charts/account-operator/templates/deployment.yaml
@@ -13,8 +13,15 @@ spec:
       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..4d822e1c6 100644
--- a/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap
+++ b/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap
@@ -81,8 +81,6 @@ 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
@@ -240,8 +238,6 @@ 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
diff --git a/charts/account-operator/values.yaml b/charts/account-operator/values.yaml
index ff101127f..978dfa0ee 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: