diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh index 068a50a0930..e7dda920cd5 100644 --- a/cluster/gce/config-common.sh +++ b/cluster/gce/config-common.sh @@ -158,3 +158,5 @@ export WINDOWS_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubelet.kubeconfig" export WINDOWS_BOOTSTRAP_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubelet.bootstrap-kubeconfig" # Path for kube-proxy kubeconfig file on Windows nodes. export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfig" +# Pause container image for Windows container. +export WINDOWS_INFRA_CONTAINER="gcr.io/gke-release/pause-win:1.1.0" diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 082f6265dc2..d16a77cbd16 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -1556,6 +1556,7 @@ KUBEPROXY_ARGS: $(yaml-quote ${KUBEPROXY_ARGS}) KUBECONFIG_FILE: $(yaml-quote ${WINDOWS_KUBECONFIG_FILE}) BOOTSTRAP_KUBECONFIG_FILE: $(yaml-quote ${WINDOWS_BOOTSTRAP_KUBECONFIG_FILE}) KUBEPROXY_KUBECONFIG_FILE: $(yaml-quote ${WINDOWS_KUBEPROXY_KUBECONFIG_FILE}) +WINDOWS_INFRA_CONTAINER: $(yaml-quote ${WINDOWS_INFRA_CONTAINER}) EOF } diff --git a/cluster/gce/windows/k8s-node-setup.psm1 b/cluster/gce/windows/k8s-node-setup.psm1 index d1f8a210a3d..67521f09aba 100644 --- a/cluster/gce/windows/k8s-node-setup.psm1 +++ b/cluster/gce/windows/k8s-node-setup.psm1 @@ -51,7 +51,6 @@ # - Document functions using proper syntax: # https://technet.microsoft.com/en-us/library/hh847834(v=wps.620).aspx -$INFRA_CONTAINER = 'gcr.io/gke-release/pause-win:1.1.0' $GCE_METADATA_SERVER = "169.254.169.254" # The "management" interface is used by the kubelet and by Windows pods to talk # to the rest of the Kubernetes cluster *without NAT*. This interface does not @@ -249,6 +248,7 @@ function Set-EnvironmentVars { "KUBEPROXY_KUBECONFIG" = ${kube_env}['KUBEPROXY_KUBECONFIG_FILE'] "LOGS_DIR" = ${kube_env}['LOGS_DIR'] "MANIFESTS_DIR" = ${kube_env}['MANIFESTS_DIR'] + "INFRA_CONTAINER" = ${kube_env}['WINDOWS_INFRA_CONTAINER'] "Path" = ${env:Path} + ";" + ${kube_env}['NODE_DIR'] "KUBE_NETWORK" = "l2bridge".ToLower()