From 6d26b2ce3f9aca0d50b24be618029acc5b95c356 Mon Sep 17 00:00:00 2001
From: benrub <benrub@gmail.com>
Date: Tue, 31 Oct 2023 14:15:06 +0200
Subject: [PATCH] Fix duplicated env setting in operator chart

---
 .../templates/deployment.yaml                            | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/charts/cbcontainers-operator/cbcontainers-operator-chart/templates/deployment.yaml b/charts/cbcontainers-operator/cbcontainers-operator-chart/templates/deployment.yaml
index 51d026f4..acf78488 100644
--- a/charts/cbcontainers-operator/cbcontainers-operator-chart/templates/deployment.yaml
+++ b/charts/cbcontainers-operator/cbcontainers-operator-chart/templates/deployment.yaml
@@ -62,6 +62,10 @@ spec:
         - /manager
         image: "{{ .Values.operator.image.repository | default "cbartifactory/octarine-operator" }}:{{ .Values.operator.image.version | default .Chart.AppVersion }}"
         env:
+        - name: OPERATOR_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         {{/* If you want to enable HTTP Proxy you need to set all 3 of the values - operator.proxy.http, operator.proxy.https and operator.proxy.noProxy */}}
         {{- if .Values.operator.proxy -}}
         - name: HTTP_PROXY
@@ -101,10 +105,5 @@ spec:
           readOnlyRootFilesystem: true
           runAsNonRoot: true
           runAsUser: 65532
-        env:
-          - name: OPERATOR_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
       serviceAccountName: cbcontainers-operator
       terminationGracePeriodSeconds: 10