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

Merge pull request #89557 from pjh/infra-fix

Browse Source 
Fix INFRA_CONTAINER variable references
This commit is contained in:
Kubernetes Prow Robot 2020-03-27 02:44:23 -07:00 committed by GitHub
commit 094bc0582a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1115,7 +1115,7 @@ function Start-WorkerServices {
$kubelet_args = $kubelet_args_str.Split(" ") $kubelet_args = $kubelet_args_str.Split(" ")
Log-Output "kubelet_args from metadata: ${kubelet_args}" Log-Output "kubelet_args from metadata: ${kubelet_args}"
$default_kubelet_args = @(` $default_kubelet_args = @(`
"--pod-infra-container-image=${INFRA_CONTAINER}" "--pod-infra-container-image=${env:INFRA_CONTAINER}"
) )
$kubelet_args = ${default_kubelet_args} + ${kubelet_args} $kubelet_args = ${default_kubelet_args} + ${kubelet_args}
if (-not (Test-NodeUsesAuthPlugin ${kube_env})) { if (-not (Test-NodeUsesAuthPlugin ${kube_env})) {
@ -1253,14 +1253,14 @@ function Configure-Crictl {
# node startup steps! # node startup steps!
# Pull-InfraContainer must be called AFTER Verify-WorkerServices. # Pull-InfraContainer must be called AFTER Verify-WorkerServices.
function Pull-InfraContainer { function Pull-InfraContainer {
$name, $label = $INFRA_CONTAINER -split ':',2 $name, $label = ${env:INFRA_CONTAINER} -split ':',2
if (-not ("$(& crictl images)" -match "$name.*$label")) { if (-not ("$(& crictl images)" -match "$name.*$label")) {
& crictl pull $INFRA_CONTAINER & crictl pull ${env:INFRA_CONTAINER}
if (!$?) { if (!$?) {
throw "Error running 'crictl pull $INFRA_CONTAINER'" throw "Error running 'crictl pull ${env:INFRA_CONTAINER}'"
} }
} }
$inspect = "$(& crictl inspecti $INFRA_CONTAINER | Out-String)" $inspect = "$(& crictl inspecti ${env:INFRA_CONTAINER} | Out-String)"
Log-Output "Infra/pause container:`n$inspect" Log-Output "Infra/pause container:`n$inspect"
} }
@ -1473,7 +1473,7 @@ function Configure_Containerd {
[plugins.cri.cni] [plugins.cri.cni]
bin_dir = 'CNI_BIN_DIR' bin_dir = 'CNI_BIN_DIR'
conf_dir = 'CNI_CONF_DIR' conf_dir = 'CNI_CONF_DIR'
"@.replace('INFRA_CONTAINER_IMAGE', $INFRA_CONTAINER).` "@.replace('INFRA_CONTAINER_IMAGE', ${env:INFRA_CONTAINER}).`
replace('CNI_BIN_DIR', ${env:CNI_DIR}).` replace('CNI_BIN_DIR', ${env:CNI_DIR}).`
replace('CNI_CONF_DIR', ${env:CNI_CONFIG_DIR}) replace('CNI_CONF_DIR', ${env:CNI_CONFIG_DIR})
} }