github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94671 from jingxu97/sep/csiproxybeta

Browse Source 
Update csi-proxy to use beta version
This commit is contained in:
Kubernetes Prow Robot 2020-09-14 13:03:25 -07:00 committed by GitHub
commit f5a54e3f58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/config-common.sh
View File

@ -162,4 +162,4 @@ export WINDOWS_INFRA_CONTAINER="gcr.io/gke-release/pause-win:1.2.1"
# Storage Path for csi-proxy. csi-proxy only needs to be installed for Windows.
export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy"
# Version for csi-proxy
export CSI_PROXY_VERSION="v0.1.0-gke.1"
export CSI_PROXY_VERSION="v0.2.0-gke.0"

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

@ -420,7 +420,8 @@ function DownloadAndInstall-CSIProxyBinaries {
function Start-CSIProxy {
if (Test-IsTestCluster $kube_env) {
Log-Output "Creating CSI Proxy Service"
& sc.exe create csiproxy binPath= "${env:NODE_DIR}\csi-proxy.exe --windows-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
@ -930,17 +931,9 @@ function Configure-GcePdTools {
}
Add-Content $PsHome\profile.ps1 `
'$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
MustDownload-File -OutFile ${env:K8S_DIR}\diskutil.exe `
-URLs "https://ddebroywin1.s3-us-west-2.amazonaws.com/diskutil.exe"
}
Copy-Item ${env:K8S_DIR}\diskutil.exe -Destination "C:\Windows\system32"
}
'$modulePath = "K8S_DIR\GetGcePdName.dll"
Unblock-File $modulePath
Import-Module -Name $modulePath'.replace('K8S_DIR', ${env:K8S_DIR})
}
# Setup cni network. This function supports both Docker and containerd.