github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Remove testcluster check for csi proxy

Browse Source 
Remove testcluster check for csi proxy after it is beta
This commit is contained in:
Jing Xu 2020-09-18 16:15:17 -07:00
parent b86e725694
commit 0752b78081
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cluster/gce/windows/k8s-node-setup.psm1
View File

@ -403,29 +403,26 @@ function DownloadAndInstall-KubernetesBinaries {
# Required ${kube_env} keys: # Required ${kube_env} keys:
# CSI_PROXY_STORAGE_PATH and CSI_PROXY_VERSION # CSI_PROXY_STORAGE_PATH and CSI_PROXY_VERSION
function DownloadAndInstall-CSIProxyBinaries { function DownloadAndInstall-CSIProxyBinaries {
if (Test-IsTestCluster $kube_env) { if (ShouldWrite-File ${env:NODE_DIR}\csi-proxy.exe) {
if (ShouldWrite-File ${env:NODE_DIR}\csi-proxy.exe) { $tmp_dir = 'C:\k8s_tmp'
$tmp_dir = 'C:\k8s_tmp' New-Item -Force -ItemType 'directory' $tmp_dir | Out-Null
New-Item -Force -ItemType 'directory' $tmp_dir | Out-Null $filename = 'csi-proxy.exe'
$filename = 'csi-proxy.exe' $urls = "${env:CSI_PROXY_STORAGE_PATH}/${env:CSI_PROXY_VERSION}/$filename"
$urls = "${env:CSI_PROXY_STORAGE_PATH}/${env:CSI_PROXY_VERSION}/$filename" MustDownload-File -OutFile $tmp_dir\$filename -URLs $urls
MustDownload-File -OutFile $tmp_dir\$filename -URLs $urls Move-Item -Force $tmp_dir\$filename ${env:NODE_DIR}\$filename
Move-Item -Force $tmp_dir\$filename ${env:NODE_DIR}\$filename # Clean up the temporary directory
# Clean up the temporary directory Remove-Item -Force -Recurse $tmp_dir
Remove-Item -Force -Recurse $tmp_dir
}
} }
} }
function Start-CSIProxy { function Start-CSIProxy {
if (Test-IsTestCluster $kube_env) { Log-Output "Creating CSI Proxy Service"
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" & sc.exe create csiproxy binPath= "${env:NODE_DIR}\csi-proxy.exe $flags"
& sc.exe create csiproxy binPath= "${env:NODE_DIR}\csi-proxy.exe $flags" & sc.exe failure csiproxy reset= 0 actions= restart/10000
& sc.exe failure csiproxy reset= 0 actions= restart/10000 Log-Output "Starting CSI Proxy Service"
Log-Output "Starting CSI Proxy Service" & sc.exe start csiproxy
& sc.exe start csiproxy
}
} }
# TODO(pjh): this is copied from # TODO(pjh): this is copied from