Skip to content

Commit 0752b78

Browse files
committed
Remove testcluster check for csi proxy
Remove testcluster check for csi proxy after it is beta
1 parent b86e725 commit 0752b78

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

cluster/gce/windows/k8s-node-setup.psm1

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -403,29 +403,26 @@ function DownloadAndInstall-KubernetesBinaries {
403403
# Required ${kube_env} keys:
404404
# CSI_PROXY_STORAGE_PATH and CSI_PROXY_VERSION
405405
function DownloadAndInstall-CSIProxyBinaries {
406-
if (Test-IsTestCluster $kube_env) {
407-
if (ShouldWrite-File ${env:NODE_DIR}\csi-proxy.exe) {
408-
$tmp_dir = 'C:\k8s_tmp'
409-
New-Item -Force -ItemType 'directory' $tmp_dir | Out-Null
410-
$filename = 'csi-proxy.exe'
411-
$urls = "${env:CSI_PROXY_STORAGE_PATH}/${env:CSI_PROXY_VERSION}/$filename"
412-
MustDownload-File -OutFile $tmp_dir\$filename -URLs $urls
413-
Move-Item -Force $tmp_dir\$filename ${env:NODE_DIR}\$filename
414-
# Clean up the temporary directory
415-
Remove-Item -Force -Recurse $tmp_dir
416-
}
406+
if (ShouldWrite-File ${env:NODE_DIR}\csi-proxy.exe) {
407+
$tmp_dir = 'C:\k8s_tmp'
408+
New-Item -Force -ItemType 'directory' $tmp_dir | Out-Null
409+
$filename = 'csi-proxy.exe'
410+
$urls = "${env:CSI_PROXY_STORAGE_PATH}/${env:CSI_PROXY_VERSION}/$filename"
411+
MustDownload-File -OutFile $tmp_dir\$filename -URLs $urls
412+
Move-Item -Force $tmp_dir\$filename ${env:NODE_DIR}\$filename
413+
# Clean up the temporary directory
414+
Remove-Item -Force -Recurse $tmp_dir
417415
}
418416
}
419417

420418
function Start-CSIProxy {
421-
if (Test-IsTestCluster $kube_env) {
422-
Log-Output "Creating CSI Proxy Service"
423-
$flags = "-windows-service -log_file=${env:LOGS_DIR}\csi-proxy.log -logtostderr=false"
424-
& sc.exe create csiproxy binPath= "${env:NODE_DIR}\csi-proxy.exe $flags"
425-
& sc.exe failure csiproxy reset= 0 actions= restart/10000
426-
Log-Output "Starting CSI Proxy Service"
427-
& sc.exe start csiproxy
428-
}
419+
Log-Output "Creating CSI Proxy Service"
420+
$flags = "-windows-service -log_file=${env:LOGS_DIR}\csi-proxy.log -logtostderr=false"
421+
& sc.exe create csiproxy binPath= "${env:NODE_DIR}\csi-proxy.exe $flags"
422+
& sc.exe failure csiproxy reset= 0 actions= restart/10000
423+
Log-Output "Starting CSI Proxy Service"
424+
& sc.exe start csiproxy
425+
429426
}
430427

431428
# TODO(pjh): this is copied from

0 commit comments

Comments
 (0)