github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

bump pause to 3.2 in kubelet

Browse Source
This commit is contained in:
Benjamin Elder 2020-02-14 11:10:29 -08:00
parent a00a1e39ef
commit 1631825e44
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/phases/kubelet/flags_test.go
View File

@ -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",
},
},
}

2
cmd/kubelet/app/options/container_runtime.go
View File

@ -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 (

2
pkg/kubelet/dockershim/docker_sandbox.go
View File

@ -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