From 1631825e447751ebe40d202f0a6052c5d27b829d Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Fri, 14 Feb 2020 11:10:29 -0800 Subject: [PATCH] bump pause to 3.2 in kubelet --- cmd/kubeadm/app/phases/kubelet/flags_test.go | 4 ++-- cmd/kubelet/app/options/container_runtime.go | 2 +- pkg/kubelet/dockershim/docker_sandbox.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/phases/kubelet/flags_test.go b/cmd/kubeadm/app/phases/kubelet/flags_test.go index 551aa5df13f..3cb93c14966 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags_test.go +++ b/cmd/kubeadm/app/phases/kubelet/flags_test.go @@ -245,14 +245,14 @@ func TestBuildKubeletArgMap(t *testing.T) { nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{ CRISocket: "/var/run/dockershim.sock", }, - pauseImage: "gcr.io/pause:3.1", + pauseImage: "gcr.io/pause:3.2", execer: cgroupfsCgroupExecer, isServiceActiveFunc: serviceIsNotActiveFunc, }, expected: map[string]string{ "network-plugin": "cni", "cgroup-driver": "cgroupfs", - "pod-infra-container-image": "gcr.io/pause:3.1", + "pod-infra-container-image": "gcr.io/pause:3.2", }, }, } diff --git a/cmd/kubelet/app/options/container_runtime.go b/cmd/kubelet/app/options/container_runtime.go index fba438a6196..d1fcaa0f074 100644 --- a/cmd/kubelet/app/options/container_runtime.go +++ b/cmd/kubelet/app/options/container_runtime.go @@ -28,7 +28,7 @@ import ( const ( // When these values are updated, also update test/e2e/framework/util.go defaultPodSandboxImageName = "k8s.gcr.io/pause" - defaultPodSandboxImageVersion = "3.1" + defaultPodSandboxImageVersion = "3.2" ) var ( diff --git a/pkg/kubelet/dockershim/docker_sandbox.go b/pkg/kubelet/dockershim/docker_sandbox.go index ac22c4d7add..825e2e9ccbd 100644 --- a/pkg/kubelet/dockershim/docker_sandbox.go +++ b/pkg/kubelet/dockershim/docker_sandbox.go @@ -38,7 +38,7 @@ import ( ) const ( - defaultSandboxImage = "k8s.gcr.io/pause:3.1" + defaultSandboxImage = "k8s.gcr.io/pause:3.2" // Various default sandbox resources requests/limits. defaultSandboxCPUshares int64 = 2