Merge pull request #93789 from jingxu97/Aug/csiproxy

Add test cluster check when starting csi proxy
This commit is contained in:
Kubernetes Prow Robot 2020-08-14 19:50:18 -07:00 committed by GitHub
commit 529c13471b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -419,8 +419,10 @@ function DownloadAndInstall-CSIProxyBinaries {
# TODO(jingxu97): Make csi-proxy.exe as a service similar to kubelet.exe
function Start-CSIProxy {
Log-Output 'Starting CSI Proxy'
Start-Process "${env:NODE_DIR}\csi-proxy.exe"
if (Test-IsTestCluster $kube_env) {
Log-Output 'Starting CSI Proxy'
Start-Process "${env:NODE_DIR}\csi-proxy.exe"
}
}
# TODO(pjh): this is copied from
@ -929,7 +931,6 @@ function Configure-GcePdTools {
'$modulePath = "K8S_DIR\GetGcePdName.dll"
Unblock-File $modulePath
Import-Module -Name $modulePath'.replace('K8S_DIR', ${env:K8S_DIR})
if (Test-IsTestCluster $kube_env) {
if (ShouldWrite-File ${env:K8S_DIR}\diskutil.exe) {
# The source code of this executable file is https://github.com/kubernetes-sigs/sig-windows-tools/blob/master/cmd/diskutil/diskutil.c