From f463cad005177332f581510c386922960beef0ac Mon Sep 17 00:00:00 2001
From: alexemc <32580729+alexemc@users.noreply.github.com>
Date: Mon, 17 Jun 2024 12:13:16 -0500
Subject: [PATCH] Do not install additional instance of retriever when
 Encryption is enabled. (#453)

---
 charts/csi-isilon/templates/controller.yaml | 24 +++++++++------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/charts/csi-isilon/templates/controller.yaml b/charts/csi-isilon/templates/controller.yaml
index 186a34f4..3a4b2ebd 100644
--- a/charts/csi-isilon/templates/controller.yaml
+++ b/charts/csi-isilon/templates/controller.yaml
@@ -273,20 +273,6 @@ spec:
               mountPath: /var/run/csi
         {{ end }}
         {{ end }}
-        - name: csi-metadata-retriever{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI metadata retriever container image." .Values.images.metadataretriever }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
-          args:
-            - "--csi-address={{ $driverSockPath }}"
-            - "--timeout=120s"
-            - "--v=5"
-          command: [ "/csi-metadata-retriever" ]
-          env:
-            - name: CSI_RETRIEVER_ENDPOINT
-              value: /var/run/csi/csi_retriever{{ $csiSidecarSuffix }}.sock
-          volumeMounts:
-            - name: socket-dir
-              mountPath: /var/run/csi
         - name: attacher{{ $csiSidecarSuffix }}
           image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
@@ -310,6 +296,16 @@ spec:
             - name: socket-dir
               mountPath: /var/run/csi
         {{- if not $encrypted }}
+        - name: csi-metadata-retriever
+          image: {{ required "Must provide the CSI metadata retriever container image." .Values.images.metadataretriever }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          command: [ "/csi-metadata-retriever" ]
+          env:
+            - name: CSI_RETRIEVER_ENDPOINT
+              value: /var/run/csi/csi_retriever.sock
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /var/run/csi
         {{- if hasKey .Values.controller "healthMonitor" }}
         {{- if eq .Values.controller.healthMonitor.enabled true }}
         - name: external-health-monitor-controller