From 29e8e3af859caa7bf0d3b4a46a80519bab95fc6f Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Thu, 27 Jan 2022 00:01:33 +0000
Subject: [PATCH] Env var for additional flags sent to the csi-proxy binary

---
 cluster/gce/config-common.sh            | 2 ++
 cluster/gce/util.sh                     | 1 +
 cluster/gce/windows/k8s-node-setup.psm1 | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh
index 383a6079dda..9f573a52d84 100644
--- a/cluster/gce/config-common.sh
+++ b/cluster/gce/config-common.sh
@@ -165,3 +165,5 @@ export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.6"
 export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy"
 # Version for csi-proxy
 export CSI_PROXY_VERSION="${CSI_PROXY_VERSION:-v1.0.1-gke.0}"
+# csi-proxy additional flags, there are additional flags that cannot be unset in k8s-node-setup.psm1
+export CSI_PROXY_FLAGS="${CSI_PROXY_FLAGS:-}"
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 2b3532c4138..c3be5a3d4d1 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -1568,6 +1568,7 @@ NODE_BINARY_TAR_URL: $(yaml-quote "${NODE_BINARY_TAR_URL}")
 NODE_BINARY_TAR_HASH: $(yaml-quote "${NODE_BINARY_TAR_HASH}")
 CSI_PROXY_STORAGE_PATH: $(yaml-quote "${CSI_PROXY_STORAGE_PATH}")
 CSI_PROXY_VERSION: $(yaml-quote "${CSI_PROXY_VERSION}")
+CSI_PROXY_FLAGS: $(yaml-quote "${CSI_PROXY_FLAGS}")
 ENABLE_CSI_PROXY: $(yaml-quote "${ENABLE_CSI_PROXY}")
 K8S_DIR: $(yaml-quote "${WINDOWS_K8S_DIR}")
 NODE_DIR: $(yaml-quote "${WINDOWS_NODE_DIR}")
diff --git a/cluster/gce/windows/k8s-node-setup.psm1 b/cluster/gce/windows/k8s-node-setup.psm1
index 4b796ae0df3..a9601762f2b 100644
--- a/cluster/gce/windows/k8s-node-setup.psm1
+++ b/cluster/gce/windows/k8s-node-setup.psm1
@@ -284,6 +284,7 @@ function Set-EnvironmentVars {
     "WINDOWS_CNI_VERSION" = ${kube_env}['WINDOWS_CNI_VERSION']
     "CSI_PROXY_STORAGE_PATH" = ${kube_env}['CSI_PROXY_STORAGE_PATH']
     "CSI_PROXY_VERSION" = ${kube_env}['CSI_PROXY_VERSION']
+    "CSI_PROXY_FLAGS" = ${kube_env}['CSI_PROXY_FLAGS']
     "ENABLE_CSI_PROXY" = ${kube_env}['ENABLE_CSI_PROXY']
     "PKI_DIR" = ${kube_env}['PKI_DIR']
     "CA_FILE_PATH" = ${kube_env}['CA_FILE_PATH']
@@ -449,7 +450,7 @@ function DownloadAndInstall-CSIProxyBinaries {
 function Start-CSIProxy {
   if ("${env:ENABLE_CSI_PROXY}" -eq "true") {
     Log-Output "Creating CSI Proxy Service"
-    $flags = "-windows-service -log_file=${env:LOGS_DIR}\csi-proxy.log -logtostderr=false"
+    $flags = "-windows-service -log_file=${env:LOGS_DIR}\csi-proxy.log -logtostderr=false ${env:CSI_PROXY_FLAGS}"
     & sc.exe create csiproxy binPath= "${env:NODE_DIR}\csi-proxy.exe $flags"
     & sc.exe failure csiproxy reset= 0 actions= restart/10000
     Log-Output "Starting CSI Proxy Service"