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

Env var for additional flags sent to the csi-proxy binary

Browse Source
This commit is contained in:
Mauricio Poppe 2022-01-27 00:01:33 +00:00
parent bf8c918e0b
commit 29e8e3af85
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,3 +165,5 @@ export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.6"
export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy" export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy"
# Version for csi-proxy # Version for csi-proxy
export CSI_PROXY_VERSION="${CSI_PROXY_VERSION:-v1.0.1-gke.0}" export CSI_PROXY_VERSION="${CSI_PROXY_VERSION:-v1.0.1-gke.0}"
# csi-proxy additional flags, there are additional flags that cannot be unset in k8s-node-setup.psm1
export CSI_PROXY_FLAGS="${CSI_PROXY_FLAGS:-}"

1
cluster/gce/util.sh
View File

@ -1568,6 +1568,7 @@ NODE_BINARY_TAR_URL: $(yaml-quote "${NODE_BINARY_TAR_URL}")
NODE_BINARY_TAR_HASH: $(yaml-quote "${NODE_BINARY_TAR_HASH}") NODE_BINARY_TAR_HASH: $(yaml-quote "${NODE_BINARY_TAR_HASH}")
CSI_PROXY_STORAGE_PATH: $(yaml-quote "${CSI_PROXY_STORAGE_PATH}") CSI_PROXY_STORAGE_PATH: $(yaml-quote "${CSI_PROXY_STORAGE_PATH}")
CSI_PROXY_VERSION: $(yaml-quote "${CSI_PROXY_VERSION}") CSI_PROXY_VERSION: $(yaml-quote "${CSI_PROXY_VERSION}")
CSI_PROXY_FLAGS: $(yaml-quote "${CSI_PROXY_FLAGS}")
ENABLE_CSI_PROXY: $(yaml-quote "${ENABLE_CSI_PROXY}") ENABLE_CSI_PROXY: $(yaml-quote "${ENABLE_CSI_PROXY}")
K8S_DIR: $(yaml-quote "${WINDOWS_K8S_DIR}") K8S_DIR: $(yaml-quote "${WINDOWS_K8S_DIR}")
NODE_DIR: $(yaml-quote "${WINDOWS_NODE_DIR}") NODE_DIR: $(yaml-quote "${WINDOWS_NODE_DIR}")

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

@ -284,6 +284,7 @@ function Set-EnvironmentVars {
"WINDOWS_CNI_VERSION" = ${kube_env}['WINDOWS_CNI_VERSION'] "WINDOWS_CNI_VERSION" = ${kube_env}['WINDOWS_CNI_VERSION']
"CSI_PROXY_STORAGE_PATH" = ${kube_env}['CSI_PROXY_STORAGE_PATH'] "CSI_PROXY_STORAGE_PATH" = ${kube_env}['CSI_PROXY_STORAGE_PATH']
"CSI_PROXY_VERSION" = ${kube_env}['CSI_PROXY_VERSION'] "CSI_PROXY_VERSION" = ${kube_env}['CSI_PROXY_VERSION']
"CSI_PROXY_FLAGS" = ${kube_env}['CSI_PROXY_FLAGS']
"ENABLE_CSI_PROXY" = ${kube_env}['ENABLE_CSI_PROXY'] "ENABLE_CSI_PROXY" = ${kube_env}['ENABLE_CSI_PROXY']
"PKI_DIR" = ${kube_env}['PKI_DIR'] "PKI_DIR" = ${kube_env}['PKI_DIR']
"CA_FILE_PATH" = ${kube_env}['CA_FILE_PATH'] "CA_FILE_PATH" = ${kube_env}['CA_FILE_PATH']
@ -449,7 +450,7 @@ function DownloadAndInstall-CSIProxyBinaries {
function Start-CSIProxy { function Start-CSIProxy {
if ("${env:ENABLE_CSI_PROXY}" -eq "true") { if ("${env:ENABLE_CSI_PROXY}" -eq "true") {
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 ${env:CSI_PROXY_FLAGS}"
& 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"