Merge pull request kubernetes#94374 from jingxu97/Aug/csiproxyservice

k8s-ci-robot · web-flow · commit 8aaa7515e58a · 2020-09-02T18:21:40.000-07:00
Start CSI proxy as service
diff --git a/cluster/gce/windows/k8s-node-setup.psm1 b/cluster/gce/windows/k8s-node-setup.psm1
@@ -417,11 +417,13 @@ function DownloadAndInstall-CSIProxyBinaries {
   }
 }
 
-# TODO(jingxu97): Make csi-proxy.exe as a service similar to kubelet.exe
 function Start-CSIProxy {
   if (Test-IsTestCluster $kube_env) {
-    Log-Output 'Starting CSI Proxy'
-    Start-Process "${env:NODE_DIR}\csi-proxy.exe"
+    Log-Output "Creating CSI Proxy Service"
+    & sc.exe create csiproxy binPath= "${env:NODE_DIR}\csi-proxy.exe --windows-service"
+    & sc.exe failure csiproxy reset= 0 actions= restart/10000
+    Log-Output "Starting CSI Proxy Service"
+    & sc.exe start csiproxy
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -417,11 +417,13 @@ function DownloadAndInstall-CSIProxyBinaries {`
`417`	`417`	`}`
`418`	`418`	`}`
`419`	`419`
`420`		`-# TODO(jingxu97): Make csi-proxy.exe as a service similar to kubelet.exe`
`421`	`420`	`function Start-CSIProxy {`
`422`	`421`	`if (Test-IsTestCluster $kube_env) {`
`423`		`- Log-Output 'Starting CSI Proxy'`
`424`		`- Start-Process "${env:NODE_DIR}\csi-proxy.exe"`
	`422`	`+ Log-Output "Creating CSI Proxy Service"`
	`423`	`+ & sc.exe create csiproxy binPath= "${env:NODE_DIR}\csi-proxy.exe --windows-service"`
	`424`	`+ & sc.exe failure csiproxy reset= 0 actions= restart/10000`
	`425`	`+ Log-Output "Starting CSI Proxy Service"`
	`426`	`+ & sc.exe start csiproxy`
`425`	`427`	`}`
`426`	`428`	`}`
`427`	`429`