Merge pull request #94908 from jingxu97/sep/csiproxy

Remove testcluster check for csi proxy
This commit is contained in:
Kubernetes Prow Robot 2020-09-19 00:58:27 -07:00 committed by GitHub
commit e2a7bd5318
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -403,7 +403,6 @@ 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
@ -414,18 +413,16 @@ function DownloadAndInstall-CSIProxyBinaries {
# 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
}
}
# TODO(pjh): this is copied from