Skip to content

Commit 3583816

Browse files
committed
Fix INFRA_CONTAINER variable references
Tested: NUM_NODES=2 NUM_WINDOWS_NODES=2 KUBE_GCE_ENABLE_IP_ALIASES=true \ KUBERNETES_NODE_PLATFORM=windows \ LOGGING_STACKDRIVER_RESOURCE_TYPES=new \ KUBE_UP_AUTOMATIC_CLEANUP=true \ WINDOWS_NODE_OS_DISTRIBUTION=win2019 \ ./cluster/kube-up.sh
1 parent c0526c6 commit 3583816

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

cluster/gce/windows/k8s-node-setup.psm1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ function Start-WorkerServices {
11151115
$kubelet_args = $kubelet_args_str.Split(" ")
11161116
Log-Output "kubelet_args from metadata: ${kubelet_args}"
11171117
$default_kubelet_args = @(`
1118-
"--pod-infra-container-image=${INFRA_CONTAINER}"
1118+
"--pod-infra-container-image=${env:INFRA_CONTAINER}"
11191119
)
11201120
$kubelet_args = ${default_kubelet_args} + ${kubelet_args}
11211121
if (-not (Test-NodeUsesAuthPlugin ${kube_env})) {
@@ -1253,14 +1253,14 @@ function Configure-Crictl {
12531253
# node startup steps!
12541254
# Pull-InfraContainer must be called AFTER Verify-WorkerServices.
12551255
function Pull-InfraContainer {
1256-
$name, $label = $INFRA_CONTAINER -split ':',2
1256+
$name, $label = ${env:INFRA_CONTAINER} -split ':',2
12571257
if (-not ("$(& crictl images)" -match "$name.*$label")) {
1258-
& crictl pull $INFRA_CONTAINER
1258+
& crictl pull ${env:INFRA_CONTAINER}
12591259
if (!$?) {
1260-
throw "Error running 'crictl pull $INFRA_CONTAINER'"
1260+
throw "Error running 'crictl pull ${env:INFRA_CONTAINER}'"
12611261
}
12621262
}
1263-
$inspect = "$(& crictl inspecti $INFRA_CONTAINER | Out-String)"
1263+
$inspect = "$(& crictl inspecti ${env:INFRA_CONTAINER} | Out-String)"
12641264
Log-Output "Infra/pause container:`n$inspect"
12651265
}
12661266

@@ -1473,7 +1473,7 @@ function Configure_Containerd {
14731473
[plugins.cri.cni]
14741474
bin_dir = 'CNI_BIN_DIR'
14751475
conf_dir = 'CNI_CONF_DIR'
1476-
"@.replace('INFRA_CONTAINER_IMAGE', $INFRA_CONTAINER).`
1476+
"@.replace('INFRA_CONTAINER_IMAGE', ${env:INFRA_CONTAINER}).`
14771477
replace('CNI_BIN_DIR', ${env:CNI_DIR}).`
14781478
replace('CNI_CONF_DIR', ${env:CNI_CONFIG_DIR})
14791479
}

0 commit comments

Comments
 (0)