From f574071b8c4e5f8f069e40519554f6e3c958239a Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Tue, 29 Oct 2019 14:25:31 -0700 Subject: [PATCH 1/2] switched to use the pause image served from gcr --- cluster/gce/windows/k8s-node-setup.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/gce/windows/k8s-node-setup.psm1 b/cluster/gce/windows/k8s-node-setup.psm1 index 678cd9c08ca..3757fd5ab69 100644 --- a/cluster/gce/windows/k8s-node-setup.psm1 +++ b/cluster/gce/windows/k8s-node-setup.psm1 @@ -51,7 +51,7 @@ # - Document functions using proper syntax: # https://technet.microsoft.com/en-us/library/hh847834(v=wps.620).aspx -$INFRA_CONTAINER = 'mcr.microsoft.com/k8s/core/pause:1.0.0' +$INFRA_CONTAINER = 'gcr.io/gke-release/pause-win:1.0.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 From 6ca8bd41033547bb7f225c7d39343dde885ffe86 Mon Sep 17 00:00:00 2001 From: Yu Liao Date: Tue, 29 Oct 2019 16:00:39 -0700 Subject: [PATCH 2/2] moved Pull-InfraContainer to the last --- cluster/gce/windows/configure.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cluster/gce/windows/configure.ps1 b/cluster/gce/windows/configure.ps1 index 33e74e14f0d..64ab8d914ab 100644 --- a/cluster/gce/windows/configure.ps1 +++ b/cluster/gce/windows/configure.ps1 @@ -140,7 +140,6 @@ try { Create-DockerRegistryKey Configure-Dockerd - Pull-InfraContainer DownloadAndInstall-KubernetesBinaries Create-NodePki Create-KubeletKubeconfig @@ -159,6 +158,8 @@ try { $config = New-FileRotationConfig Schedule-LogRotation -Pattern '.*\.log$' -Path ${env:LOGS_DIR} -RepetitionInterval $(New-Timespan -Hour 1) -Config $config + + Pull-InfraContainer } catch { Write-Host 'Exception caught in script:'