diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 0c8abaaf2fa..44f6b64d6e9 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -266,7 +266,7 @@ const ( DefaultEtcdVersion = "3.4.3-0" // PauseVersion indicates the default pause image version for kubeadm - PauseVersion = "3.1" + PauseVersion = "3.2" // Etcd defines variable used internally when referring to etcd component Etcd = "etcd" 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/kubeadm/app/util/template_test.go b/cmd/kubeadm/app/util/template_test.go index c6d3def0669..c2dd0ed2454 100644 --- a/cmd/kubeadm/app/util/template_test.go +++ b/cmd/kubeadm/app/util/template_test.go @@ -21,9 +21,9 @@ import ( ) const ( - validTmpl = "image: {{ .ImageRepository }}/pause:3.1" - validTmplOut = "image: k8s.gcr.io/pause:3.1" - doNothing = "image: k8s.gcr.io/pause:3.1" + validTmpl = "image: {{ .ImageRepository }}/pause:3.2" + validTmplOut = "image: k8s.gcr.io/pause:3.2" + doNothing = "image: k8s.gcr.io/pause:3.2" invalidTmpl1 = "{{ .baz }/d}" invalidTmpl2 = "{{ !foobar }}" ) diff --git a/cmd/kubelet/app/options/container_runtime.go b/cmd/kubelet/app/options/container_runtime.go index fba438a6196..512b43988b3 100644 --- a/cmd/kubelet/app/options/container_runtime.go +++ b/cmd/kubelet/app/options/container_runtime.go @@ -26,9 +26,9 @@ import ( ) const ( - // When these values are updated, also update test/e2e/framework/util.go + // When these values are updated, also update test/utils/image/manifest.go defaultPodSandboxImageName = "k8s.gcr.io/pause" - defaultPodSandboxImageVersion = "3.1" + defaultPodSandboxImageVersion = "3.2" ) var ( diff --git a/hack/testdata/pod-with-precision.json b/hack/testdata/pod-with-precision.json index f96fb21e407..2b501eba82c 100644 --- a/hack/testdata/pod-with-precision.json +++ b/hack/testdata/pod-with-precision.json @@ -1,24 +1,24 @@ { - "apiVersion": "v1", - "kind": "Pod", - "metadata": { - "name": "pod-with-precision" - }, - "spec": { - "activeDeadlineSeconds": 2147483647, - "containers": [ - { - "name": "kubernetes-pause", - "image": "k8s.gcr.io/pause:3.1" - } - ], - "restartPolicy": "Never", - "securityContext": { - "supplementalGroups": [ - 0, - 1000030003, - 2147483647 - ] + "apiVersion": "v1", + "kind": "Pod", + "metadata": { + "name": "pod-with-precision" + }, + "spec": { + "activeDeadlineSeconds": 2147483647, + "containers": [ + { + "name": "kubernetes-pause", + "image": "k8s.gcr.io/pause:3.2" } + ], + "restartPolicy": "Never", + "securityContext": { + "supplementalGroups": [ + 0, + 1000030003, + 2147483647 + ] } -} + } +} \ No newline at end of file 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 diff --git a/staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml b/staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml index 6a2eed872a9..57b004e720d 100644 --- a/staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml +++ b/staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.1 + image: k8s.gcr.io/pause:3.2 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.1 + image: k8s.gcr.io/pause:3.2 diff --git a/staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml b/staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml index 71d9b24bae1..e4541b8bc35 100644 --- a/staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml +++ b/staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml @@ -14,4 +14,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.1 + image: k8s.gcr.io/pause:3.2 diff --git a/test/cmd/core.sh b/test/cmd/core.sh index 3b5f30c90b7..f52267ddb90 100755 --- a/test/cmd/core.sh +++ b/test/cmd/core.sh @@ -517,9 +517,9 @@ run_pod_tests() { kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'changed-with-yaml:' ## Patch pod from JSON can change image # Command - kubectl patch "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "k8s.gcr.io/pause:3.1"}]}}' + kubectl patch "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "k8s.gcr.io/pause:3.2"}]}}' # Post-condition: valid-pod POD has expected image - kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.1:' + kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.2:' ## If resourceVersion is specified in the patch, it will be treated as a precondition, i.e., if the resourceVersion is different from that is stored in the server, the Patch should be rejected ERROR_FILE="${KUBE_TEMP}/conflict-error" diff --git a/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml b/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml index 6a2eed872a9..57b004e720d 100644 --- a/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml +++ b/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.1 + image: k8s.gcr.io/pause:3.2 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.1 + image: k8s.gcr.io/pause:3.2 diff --git a/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml b/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml index 71d9b24bae1..e4541b8bc35 100644 --- a/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml +++ b/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml @@ -14,4 +14,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.1 + image: k8s.gcr.io/pause:3.2 diff --git a/test/integration/benchmark-controller.json b/test/integration/benchmark-controller.json index 4d589dd0535..c0c1a901d0c 100644 --- a/test/integration/benchmark-controller.json +++ b/test/integration/benchmark-controller.json @@ -17,7 +17,7 @@ "spec": { "containers": [{ "name": "test-container", - "image": "k8s.gcr.io/pause:3.1" + "image": "k8s.gcr.io/pause:3.2" }] } } diff --git a/test/integration/scheduler_perf/config/pod-default.yaml b/test/integration/scheduler_perf/config/pod-default.yaml index b3e8ccc657e..5ab07291f85 100644 --- a/test/integration/scheduler_perf/config/pod-default.yaml +++ b/test/integration/scheduler_perf/config/pod-default.yaml @@ -4,7 +4,7 @@ metadata: generateName: pod- spec: containers: - - image: k8s.gcr.io/pause:3.1 + - image: k8s.gcr.io/pause:3.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-node-affinity.yaml b/test/integration/scheduler_perf/config/pod-with-node-affinity.yaml index 9e20a56bbe3..813b949981a 100644 --- a/test/integration/scheduler_perf/config/pod-with-node-affinity.yaml +++ b/test/integration/scheduler_perf/config/pod-with-node-affinity.yaml @@ -14,7 +14,7 @@ spec: - zone1 - zone2 containers: - - image: k8s.gcr.io/pause:3.1 + - image: k8s.gcr.io/pause:3.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml b/test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml index 256e931613f..393d8f49954 100644 --- a/test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml +++ b/test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml @@ -14,7 +14,7 @@ spec: topologyKey: failure-domain.beta.kubernetes.io/zone namespaces: ["sched-test", "sched-setup"] containers: - - image: k8s.gcr.io/pause:3.1 + - image: k8s.gcr.io/pause:3.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml b/test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml index 26ff4dcc19f..8ce2007284d 100644 --- a/test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml +++ b/test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml @@ -15,7 +15,7 @@ spec: topologyKey: kubernetes.io/hostname namespaces: ["sched-test", "sched-setup"] containers: - - image: k8s.gcr.io/pause:3.1 + - image: k8s.gcr.io/pause:3.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml b/test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml index d055d4981bd..d6e927845f3 100644 --- a/test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml +++ b/test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml @@ -16,7 +16,7 @@ spec: namespaces: ["sched-test", "sched-setup"] weight: 1 containers: - - image: k8s.gcr.io/pause:3.1 + - image: k8s.gcr.io/pause:3.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml b/test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml index cfd4feb6bb1..8ee0b694d9b 100644 --- a/test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml +++ b/test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml @@ -16,7 +16,7 @@ spec: namespaces: ["sched-test", "sched-setup"] weight: 1 containers: - - image: k8s.gcr.io/pause:3.1 + - image: k8s.gcr.io/pause:3.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-secret-volume.yaml b/test/integration/scheduler_perf/config/pod-with-secret-volume.yaml index 29e6384104e..e519f1f46dd 100644 --- a/test/integration/scheduler_perf/config/pod-with-secret-volume.yaml +++ b/test/integration/scheduler_perf/config/pod-with-secret-volume.yaml @@ -4,7 +4,7 @@ metadata: generateName: secret-volume- spec: containers: - - image: k8s.gcr.io/pause:3.1 + - image: k8s.gcr.io/pause:3.2 name: pause ports: - containerPort: 80 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 9fedd100d25..cfd03add8c2 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -236,7 +236,7 @@ func initImageConfigs() map[int]Config { configs[Nonewprivs] = Config{e2eRegistry, "nonewprivs", "1.0"} configs[NonRoot] = Config{e2eRegistry, "nonroot", "1.0"} // Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go - configs[Pause] = Config{gcRegistry, "pause", "3.1"} + configs[Pause] = Config{gcRegistry, "pause", "3.2"} configs[Perl] = Config{dockerLibraryRegistry, "perl", "5.26"} configs[PrometheusDummyExporter] = Config{gcRegistry, "prometheus-dummy-exporter", "v0.1.0"} configs[PrometheusToSd] = Config{gcRegistry, "prometheus-to-sd", "v0.5.0"} diff --git a/test/utils/runners.go b/test/utils/runners.go index e53e8b8e58e..164b985651c 100644 --- a/test/utils/runners.go +++ b/test/utils/runners.go @@ -1307,7 +1307,7 @@ func MakePodSpec() v1.PodSpec { return v1.PodSpec{ Containers: []v1.Container{{ Name: "pause", - Image: "k8s.gcr.io/pause:3.1", + Image: "k8s.gcr.io/pause:3.2", Ports: []v1.ContainerPort{{ContainerPort: 80}}, Resources: v1.ResourceRequirements{ Limits: v1.ResourceList{ @@ -1664,7 +1664,7 @@ type DaemonConfig struct { func (config *DaemonConfig) Run() error { if config.Image == "" { - config.Image = "k8s.gcr.io/pause:3.1" + config.Image = "k8s.gcr.io/pause:3.2" } nameLabel := map[string]string{ "name": config.Name + "-daemon",