diff --git a/cluster/gce/windows/k8s-node-setup.psm1 b/cluster/gce/windows/k8s-node-setup.psm1 index 4ffaa8f6516..704cf702021 100644 --- a/cluster/gce/windows/k8s-node-setup.psm1 +++ b/cluster/gce/windows/k8s-node-setup.psm1 @@ -403,29 +403,26 @@ function DownloadAndInstall-KubernetesBinaries { # Required ${kube_env} keys: # CSI_PROXY_STORAGE_PATH and CSI_PROXY_VERSION function DownloadAndInstall-CSIProxyBinaries { - if (Test-IsTestCluster $kube_env) { - if (ShouldWrite-File ${env:NODE_DIR}\csi-proxy.exe) { - $tmp_dir = 'C:\k8s_tmp' - New-Item -Force -ItemType 'directory' $tmp_dir | Out-Null - $filename = 'csi-proxy.exe' - $urls = "${env:CSI_PROXY_STORAGE_PATH}/${env:CSI_PROXY_VERSION}/$filename" - MustDownload-File -OutFile $tmp_dir\$filename -URLs $urls - Move-Item -Force $tmp_dir\$filename ${env:NODE_DIR}\$filename - # Clean up the temporary directory - Remove-Item -Force -Recurse $tmp_dir - } + if (ShouldWrite-File ${env:NODE_DIR}\csi-proxy.exe) { + $tmp_dir = 'C:\k8s_tmp' + New-Item -Force -ItemType 'directory' $tmp_dir | Out-Null + $filename = 'csi-proxy.exe' + $urls = "${env:CSI_PROXY_STORAGE_PATH}/${env:CSI_PROXY_VERSION}/$filename" + MustDownload-File -OutFile $tmp_dir\$filename -URLs $urls + Move-Item -Force $tmp_dir\$filename ${env:NODE_DIR}\$filename + # Clean up the temporary directory + Remove-Item -Force -Recurse $tmp_dir } } function Start-CSIProxy { - if (Test-IsTestCluster $kube_env) { - Log-Output "Creating CSI Proxy Service" - $flags = "-windows-service -log_file=${env:LOGS_DIR}\csi-proxy.log -logtostderr=false" - & 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" - & sc.exe start csiproxy - } + Log-Output "Creating CSI Proxy Service" + $flags = "-windows-service -log_file=${env:LOGS_DIR}\csi-proxy.log -logtostderr=false" + & 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" + & sc.exe start csiproxy + } # TODO(pjh): this is copied from