diff --git a/build/dependencies.yaml b/build/dependencies.yaml index c256b59bcdb..a1d09e6c5f7 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -189,17 +189,14 @@ dependencies: - path: build/common.sh match: __default_go_runner_version= - # TODO: enable once pause 3.10 is promoted - # https://github.com/kubernetes/kubernetes/issues/125092 - # - # - name: "registry.k8s.io/pause" - # version: 3.10 - # refPaths: - # - path: build/pause/Makefile - # match: TAG\s*\?= + - name: "registry.k8s.io/pause" + version: 3.10 + refPaths: + - path: build/pause/Makefile + match: TAG\s*\?= - name: "registry.k8s.io/pause: dependents" - version: 3.9 + version: 3.10 refPaths: - path: cluster/gce/config-common.sh match: registry.k8s.io\/pause:\d+\.\d+ @@ -209,12 +206,6 @@ dependencies: match: registry.k8s.io\/pause:\d+\.\d+ - path: cmd/kubeadm/app/constants/constants.go match: PauseVersion\s+= - - path: cmd/kubeadm/app/util/template_test.go - match: validTmpl\s+= - - path: cmd/kubeadm/app/util/template_test.go - match: validTmplOut\s+= - - path: cmd/kubeadm/app/util/template_test.go - match: doNothing\s+= - path: cmd/kubelet/app/options/container_runtime.go match: defaultPodSandboxImageVersion\s+= - path: hack/testdata/pod-with-precision.json @@ -249,8 +240,6 @@ dependencies: match: registry.k8s.io\/pause:\d+\.\d+ - path: test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml match: registry.k8s.io\/pause:\d+\.\d+ - - path: test/utils/runners.go - match: registry.k8s.io\/pause:\d+\.\d+ - path: test/utils/image/manifest.go match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"} diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh index e55f2ab204f..a325d1bbbc5 100644 --- a/cluster/gce/config-common.sh +++ b/cluster/gce/config-common.sh @@ -154,7 +154,7 @@ export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfi # Path for kube-proxy kubeconfig file on Windows nodes. export WINDOWS_NODEPROBLEMDETECTOR_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\node-problem-detector.kubeconfig" # Pause container image for Windows container. -export WINDOWS_INFRA_CONTAINER="registry.k8s.io/pause:3.9" +export WINDOWS_INFRA_CONTAINER="registry.k8s.io/pause:3.10" # Storage Path for csi-proxy. csi-proxy only needs to be installed for Windows. export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy" # Version for csi-proxy diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 45508ea89ab..ce5ff220afe 100755 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -3279,7 +3279,7 @@ oom_score = -999 [plugins."io.containerd.grpc.v1.cri"] stream_server_address = "127.0.0.1" max_container_log_line_size = ${CONTAINERD_MAX_CONTAINER_LOG_LINE:-262144} - sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.9"}" + sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.10"}" [plugins."io.containerd.grpc.v1.cri".cni] bin_dir = "${KUBE_HOME}/bin" conf_dir = "/etc/cni/net.d" diff --git a/cluster/gce/windows/smoke-test.sh b/cluster/gce/windows/smoke-test.sh index 6d866a81886..cef074f74da 100755 --- a/cluster/gce/windows/smoke-test.sh +++ b/cluster/gce/windows/smoke-test.sh @@ -341,7 +341,7 @@ spec: spec: containers: - name: pause-win - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 nodeSelector: kubernetes.io/os: windows tolerations: diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 2e519e82839..cdce7987d2a 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -435,7 +435,7 @@ const ( ModeNode string = "Node" // PauseVersion indicates the default pause image version for kubeadm - PauseVersion = "3.9" + PauseVersion = "3.10" // CgroupDriverSystemd holds the systemd driver type CgroupDriverSystemd = "systemd" diff --git a/cmd/kubeadm/app/phases/kubelet/flags_test.go b/cmd/kubeadm/app/phases/kubelet/flags_test.go index b4881379574..5c68b33cada 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags_test.go +++ b/cmd/kubeadm/app/phases/kubelet/flags_test.go @@ -79,11 +79,11 @@ func TestBuildKubeletArgs(t *testing.T) { nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{ CRISocket: "unix:///var/run/containerd/containerd.sock", }, - pauseImage: "registry.k8s.io/pause:3.9", + pauseImage: "registry.k8s.io/pause:ver", }, expected: []kubeadmapi.Arg{ {Name: "container-runtime-endpoint", Value: "unix:///var/run/containerd/containerd.sock"}, - {Name: "pod-infra-container-image", Value: "registry.k8s.io/pause:3.9"}, + {Name: "pod-infra-container-image", Value: "registry.k8s.io/pause:ver"}, }, }, } diff --git a/cmd/kubeadm/app/util/runtime/runtime_test.go b/cmd/kubeadm/app/util/runtime/runtime_test.go index d1990923414..ff2452a654c 100644 --- a/cmd/kubeadm/app/util/runtime/runtime_test.go +++ b/cmd/kubeadm/app/util/runtime/runtime_test.go @@ -164,8 +164,8 @@ func TestListKubeContainers(t *testing.T) { func TestSandboxImage(t *testing.T) { fcmd := fakeexec.FakeCmd{ CombinedOutputScript: []fakeexec.FakeAction{ - func() ([]byte, []byte, error) { return []byte("registry.k8s.io/pause:3.9"), nil, nil }, - func() ([]byte, []byte, error) { return []byte("registry.k8s.io/pause:3.9\n"), nil, nil }, + func() ([]byte, []byte, error) { return []byte("registry.k8s.io/pause:ver"), nil, nil }, + func() ([]byte, []byte, error) { return []byte("registry.k8s.io/pause:ver\n"), nil, nil }, func() ([]byte, []byte, error) { return nil, nil, nil }, func() ([]byte, []byte, error) { return nil, nil, &fakeexec.FakeExitError{Status: 1} }, }, @@ -181,8 +181,8 @@ func TestSandboxImage(t *testing.T) { expected string isError bool }{ - {"valid: read sandbox image normally", "registry.k8s.io/pause:3.9", false}, - {"valid: read sandbox image with leading/trailing white spaces", "registry.k8s.io/pause:3.9", false}, + {"valid: read sandbox image normally", "registry.k8s.io/pause:ver", false}, + {"valid: read sandbox image with leading/trailing white spaces", "registry.k8s.io/pause:ver", false}, {"invalid: read empty sandbox image", "", true}, {"invalid: failed to read sandbox image", "", true}, } diff --git a/cmd/kubeadm/app/util/template_test.go b/cmd/kubeadm/app/util/template_test.go index 9fb8a224b15..32830a02b83 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.9" - validTmplOut = "image: registry.k8s.io/pause:3.9" - doNothing = "image: registry.k8s.io/pause:3.9" + validTmpl = "image: {{ .ImageRepository }}/pause:ver" + validTmplOut = "image: registry.k8s.io/pause:ver" + doNothing = "image: registry.k8s.io/pause:ver" invalidTmpl1 = "{{ .baz }/d}" invalidTmpl2 = "{{ !foobar }}" ) diff --git a/cmd/kubelet/app/options/container_runtime.go b/cmd/kubelet/app/options/container_runtime.go index 3e0b1e4cf16..de04bf38ec5 100644 --- a/cmd/kubelet/app/options/container_runtime.go +++ b/cmd/kubelet/app/options/container_runtime.go @@ -23,7 +23,7 @@ import ( const ( // When these values are updated, also update test/utils/image/manifest.go defaultPodSandboxImageName = "registry.k8s.io/pause" - defaultPodSandboxImageVersion = "3.9" + defaultPodSandboxImageVersion = "3.10" ) var ( diff --git a/hack/testdata/filter/pod-apply-selector.yaml b/hack/testdata/filter/pod-apply-selector.yaml index ca4119ed559..3d6a7e06567 100644 --- a/hack/testdata/filter/pod-apply-selector.yaml +++ b/hack/testdata/filter/pod-apply-selector.yaml @@ -8,4 +8,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 diff --git a/hack/testdata/filter/pod-dont-apply.yaml b/hack/testdata/filter/pod-dont-apply.yaml index 438a7fd68d7..e6c41bf5f0e 100644 --- a/hack/testdata/filter/pod-dont-apply.yaml +++ b/hack/testdata/filter/pod-dont-apply.yaml @@ -8,4 +8,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 diff --git a/hack/testdata/multi-resource-1.yaml b/hack/testdata/multi-resource-1.yaml index 714292e71b8..598dcae4252 100644 --- a/hack/testdata/multi-resource-1.yaml +++ b/hack/testdata/multi-resource-1.yaml @@ -11,7 +11,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 --- apiVersion: v1 kind: Namespace diff --git a/hack/testdata/multi-resource-3.yaml b/hack/testdata/multi-resource-3.yaml index 8516579b474..26d142872e4 100644 --- a/hack/testdata/multi-resource-3.yaml +++ b/hack/testdata/multi-resource-3.yaml @@ -8,7 +8,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 --- apiVersion: v1 kind: Pod @@ -17,7 +17,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 --- apiVersion: v1 kind: Pod @@ -26,5 +26,5 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 diff --git a/hack/testdata/multi-resource-json-modify.json b/hack/testdata/multi-resource-json-modify.json index 505f3c2c180..8be552f7898 100644 --- a/hack/testdata/multi-resource-json-modify.json +++ b/hack/testdata/multi-resource-json-modify.json @@ -43,7 +43,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "registry.k8s.io/pause:3.9", + "image": "registry.k8s.io/pause:3.10", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-json.json b/hack/testdata/multi-resource-json.json index bca942f8676..6a2b352d6a2 100644 --- a/hack/testdata/multi-resource-json.json +++ b/hack/testdata/multi-resource-json.json @@ -41,7 +41,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "registry.k8s.io/pause:3.9", + "image": "registry.k8s.io/pause:3.10", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list-modify.json b/hack/testdata/multi-resource-list-modify.json index 458b865d20f..a5bcce84765 100644 --- a/hack/testdata/multi-resource-list-modify.json +++ b/hack/testdata/multi-resource-list-modify.json @@ -47,7 +47,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "registry.k8s.io/pause:3.9", + "image": "registry.k8s.io/pause:3.10", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list.json b/hack/testdata/multi-resource-list.json index 0687a0ad46a..78c0a3f6cee 100644 --- a/hack/testdata/multi-resource-list.json +++ b/hack/testdata/multi-resource-list.json @@ -45,7 +45,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "registry.k8s.io/pause:3.9", + "image": "registry.k8s.io/pause:3.10", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist-modify.json b/hack/testdata/multi-resource-rclist-modify.json index da770f54a2e..635acef8189 100644 --- a/hack/testdata/multi-resource-rclist-modify.json +++ b/hack/testdata/multi-resource-rclist-modify.json @@ -26,7 +26,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "registry.k8s.io/pause:3.9", + "image": "registry.k8s.io/pause:3.10", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "registry.k8s.io/pause:3.9", + "image": "registry.k8s.io/pause:3.10", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist.json b/hack/testdata/multi-resource-rclist.json index da770f54a2e..635acef8189 100644 --- a/hack/testdata/multi-resource-rclist.json +++ b/hack/testdata/multi-resource-rclist.json @@ -26,7 +26,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "registry.k8s.io/pause:3.9", + "image": "registry.k8s.io/pause:3.10", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "registry.k8s.io/pause:3.9", + "image": "registry.k8s.io/pause:3.10", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-yaml-modify.yaml b/hack/testdata/multi-resource-yaml-modify.yaml index 47489df5a8d..dfc920d0452 100644 --- a/hack/testdata/multi-resource-yaml-modify.yaml +++ b/hack/testdata/multi-resource-yaml-modify.yaml @@ -29,7 +29,7 @@ spec: spec: containers: - name: mock-container - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/multi-resource-yaml.yaml b/hack/testdata/multi-resource-yaml.yaml index 71892eabbdc..905360f6148 100644 --- a/hack/testdata/multi-resource-yaml.yaml +++ b/hack/testdata/multi-resource-yaml.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: mock-container - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/pod-apply.yaml b/hack/testdata/pod-apply.yaml index 732e9a5b8e1..b69c81f0884 100644 --- a/hack/testdata/pod-apply.yaml +++ b/hack/testdata/pod-apply.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 diff --git a/hack/testdata/pod-with-precision.json b/hack/testdata/pod-with-precision.json index ff96cd7cee3..2c0d7189892 100644 --- a/hack/testdata/pod-with-precision.json +++ b/hack/testdata/pod-with-precision.json @@ -9,7 +9,7 @@ "containers": [ { "name": "kubernetes-pause", - "image": "registry.k8s.io/pause:3.9" + "image": "registry.k8s.io/pause:3.10" } ], "restartPolicy": "Never", diff --git a/hack/testdata/pod.yaml b/hack/testdata/pod.yaml index 3e70b993017..4114989e79c 100644 --- a/hack/testdata/pod.yaml +++ b/hack/testdata/pod.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 diff --git a/hack/testdata/prune/a.yaml b/hack/testdata/prune/a.yaml index 92aadbc280c..fa77ebe3e07 100644 --- a/hack/testdata/prune/a.yaml +++ b/hack/testdata/prune/a.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 diff --git a/hack/testdata/sorted-pods/sorted-pod1.yaml b/hack/testdata/sorted-pods/sorted-pod1.yaml index fa7d4823236..128e6a97a22 100644 --- a/hack/testdata/sorted-pods/sorted-pod1.yaml +++ b/hack/testdata/sorted-pods/sorted-pod1.yaml @@ -8,8 +8,8 @@ metadata: spec: containers: - name: kubernetes-pause2 - image: registry.k8s.io/pause:3.9 - resources: + image: registry.k8s.io/pause:3.10 + resources: requests: memory: "64Mi" cpu: "250m" diff --git a/hack/testdata/sorted-pods/sorted-pod2.yaml b/hack/testdata/sorted-pods/sorted-pod2.yaml index bc21f7c50bc..5bb9dab5e68 100644 --- a/hack/testdata/sorted-pods/sorted-pod2.yaml +++ b/hack/testdata/sorted-pods/sorted-pod2.yaml @@ -8,8 +8,8 @@ metadata: spec: containers: - name: kubernetes-pause1 - image: registry.k8s.io/pause:3.9 - resources: + image: registry.k8s.io/pause:3.10 + resources: requests: memory: "1G" cpu: "0.5" diff --git a/hack/testdata/sorted-pods/sorted-pod3.yaml b/hack/testdata/sorted-pods/sorted-pod3.yaml index b0fe57bb5f2..104e4903c07 100644 --- a/hack/testdata/sorted-pods/sorted-pod3.yaml +++ b/hack/testdata/sorted-pods/sorted-pod3.yaml @@ -8,4 +8,4 @@ metadata: spec: containers: - name: kubernetes-pause3 - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 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 74ac7d76af0..dba096d7245 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: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 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 fba31a6ac04..a619c6ae13c 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: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 diff --git a/test/cmd/core.sh b/test/cmd/core.sh index ac2bb1c6404..70de498a561 100755 --- a/test/cmd/core.sh +++ b/test/cmd/core.sh @@ -537,9 +537,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": "registry.k8s.io/pause:3.9"}]}}' + kubectl patch "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "registry.k8s.io/pause:3.10"}]}}' # Post-condition: valid-pod POD has expected image - kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.9:' + kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.10:' # pod has field for kubectl patch field manager output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1) diff --git a/test/cmd/diff.sh b/test/cmd/diff.sh index 6b4a114a725..63bcb6b066b 100755 --- a/test/cmd/diff.sh +++ b/test/cmd/diff.sh @@ -128,7 +128,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 --- apiVersion: v1 kind: Pod @@ -140,7 +140,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 --- apiVersion: v1 kind: Pod @@ -152,7 +152,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 EOF kube::test::get_object_assert 'pods a -n nsbprune' "{{${id_field:?}}}" 'a' kube::test::get_object_assert 'pods b -n nsbprune' "{{${id_field:?}}}" 'b' @@ -169,7 +169,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 --- apiVersion: v1 kind: Pod @@ -181,7 +181,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 EOF ) output_message=$(echo "${PRUNE}" | kubectl diff -l prune-group=true -f -) diff --git a/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml b/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml index 4b48566d50c..f8d3a723ec4 100644 --- a/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml +++ b/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml @@ -81,6 +81,6 @@ spec: - name: root-mount mountPath: /root containers: - - image: "registry.k8s.io/pause:3.9" + - image: "registry.k8s.io/pause:3.10" name: pause 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 74ac7d76af0..dba096d7245 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: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 diff --git a/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml b/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml index fba31a6ac04..a619c6ae13c 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: registry.k8s.io/pause:3.9 + image: registry.k8s.io/pause:3.10 diff --git a/test/integration/benchmark-controller.json b/test/integration/benchmark-controller.json index 0da0865a2ae..e703d482fbb 100644 --- a/test/integration/benchmark-controller.json +++ b/test/integration/benchmark-controller.json @@ -17,7 +17,7 @@ "spec": { "containers": [{ "name": "test-container", - "image": "registry.k8s.io/pause:3.9" + "image": "registry.k8s.io/pause:3.10" }] } } diff --git a/test/integration/scheduler_perf/config/churn/pod-default.yaml b/test/integration/scheduler_perf/config/churn/pod-default.yaml index 8b749f6e084..f0fcd449ee7 100644 --- a/test/integration/scheduler_perf/config/churn/pod-default.yaml +++ b/test/integration/scheduler_perf/config/churn/pod-default.yaml @@ -4,5 +4,5 @@ metadata: generateName: pod-churn- spec: containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause diff --git a/test/integration/scheduler_perf/config/dra/pod-with-claim-template.yaml b/test/integration/scheduler_perf/config/dra/pod-with-claim-template.yaml index eb1dd879205..a60fecfb75d 100644 --- a/test/integration/scheduler_perf/config/dra/pod-with-claim-template.yaml +++ b/test/integration/scheduler_perf/config/dra/pod-with-claim-template.yaml @@ -4,7 +4,7 @@ metadata: generateName: test-dra spec: containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause resources: claims: diff --git a/test/integration/scheduler_perf/config/dra/pod-with-many-claim-templates.yaml b/test/integration/scheduler_perf/config/dra/pod-with-many-claim-templates.yaml index 2e1a3c96be2..a9e12832bec 100644 --- a/test/integration/scheduler_perf/config/dra/pod-with-many-claim-templates.yaml +++ b/test/integration/scheduler_perf/config/dra/pod-with-many-claim-templates.yaml @@ -4,7 +4,7 @@ metadata: generateName: test-dra spec: containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause resources: claims: diff --git a/test/integration/scheduler_perf/config/pod-affinity-ns-selector.yaml b/test/integration/scheduler_perf/config/pod-affinity-ns-selector.yaml index f4e027b45d8..40f8bdaaeef 100644 --- a/test/integration/scheduler_perf/config/pod-affinity-ns-selector.yaml +++ b/test/integration/scheduler_perf/config/pod-affinity-ns-selector.yaml @@ -16,7 +16,7 @@ spec: matchLabels: team: devops containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-anti-affinity-ns-selector.yaml b/test/integration/scheduler_perf/config/pod-anti-affinity-ns-selector.yaml index d3ce319a8af..fd1bfb46c45 100644 --- a/test/integration/scheduler_perf/config/pod-anti-affinity-ns-selector.yaml +++ b/test/integration/scheduler_perf/config/pod-anti-affinity-ns-selector.yaml @@ -16,7 +16,7 @@ spec: matchLabels: team: devops containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-default.yaml b/test/integration/scheduler_perf/config/pod-default.yaml index 00bb31904f2..458c20a17ac 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: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-high-priority-large-cpu.yaml b/test/integration/scheduler_perf/config/pod-high-priority-large-cpu.yaml index 2b665e2e625..82efca4adc3 100644 --- a/test/integration/scheduler_perf/config/pod-high-priority-large-cpu.yaml +++ b/test/integration/scheduler_perf/config/pod-high-priority-large-cpu.yaml @@ -5,7 +5,7 @@ metadata: spec: priority: 10 containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-high-priority.yaml b/test/integration/scheduler_perf/config/pod-high-priority.yaml index 518ba19541f..554e0608d87 100644 --- a/test/integration/scheduler_perf/config/pod-high-priority.yaml +++ b/test/integration/scheduler_perf/config/pod-high-priority.yaml @@ -5,7 +5,7 @@ metadata: spec: priority: 10 containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-large-cpu.yaml b/test/integration/scheduler_perf/config/pod-large-cpu.yaml index 97ffc035b1d..07520019ca9 100644 --- a/test/integration/scheduler_perf/config/pod-large-cpu.yaml +++ b/test/integration/scheduler_perf/config/pod-large-cpu.yaml @@ -4,7 +4,7 @@ metadata: generateName: pod- spec: containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-low-priority.yaml b/test/integration/scheduler_perf/config/pod-low-priority.yaml index 16149c8bfb9..a5d431c84cd 100644 --- a/test/integration/scheduler_perf/config/pod-low-priority.yaml +++ b/test/integration/scheduler_perf/config/pod-low-priority.yaml @@ -5,7 +5,7 @@ metadata: spec: terminationGracePeriodSeconds: 0 containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-preferred-affinity-ns-selector.yaml b/test/integration/scheduler_perf/config/pod-preferred-affinity-ns-selector.yaml index b197b3f1f42..8e32102e159 100644 --- a/test/integration/scheduler_perf/config/pod-preferred-affinity-ns-selector.yaml +++ b/test/integration/scheduler_perf/config/pod-preferred-affinity-ns-selector.yaml @@ -18,7 +18,7 @@ spec: team: devops weight: 1 containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-preferred-anti-affinity-ns-selector.yaml b/test/integration/scheduler_perf/config/pod-preferred-anti-affinity-ns-selector.yaml index 0c544d5550f..a7d4c96137e 100644 --- a/test/integration/scheduler_perf/config/pod-preferred-anti-affinity-ns-selector.yaml +++ b/test/integration/scheduler_perf/config/pod-preferred-anti-affinity-ns-selector.yaml @@ -18,7 +18,7 @@ spec: team: devops weight: 1 containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 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 b9c6a1cdff7..44d6105aebc 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: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-node-inclusion-policy.yaml b/test/integration/scheduler_perf/config/pod-with-node-inclusion-policy.yaml index 5b1da5716fe..f9a9ebe3861 100644 --- a/test/integration/scheduler_perf/config/pod-with-node-inclusion-policy.yaml +++ b/test/integration/scheduler_perf/config/pod-with-node-inclusion-policy.yaml @@ -6,7 +6,7 @@ metadata: foo: bar spec: containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 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 e1db1fce7c7..d0fc2659c26 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: topology.kubernetes.io/zone namespaces: ["sched-1", "sched-0"] containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 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 e39d6c7a600..9c52b32071a 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 @@ -14,7 +14,7 @@ spec: topologyKey: kubernetes.io/hostname namespaces: ["sched-1", "sched-0"] containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 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 a2ba25365e7..5b3f43ccf37 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-1", "sched-0"] weight: 1 containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 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 2da786e2256..e0e3d8a32a7 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-1", "sched-0"] weight: 1 containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml b/test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml index 87a597cf161..2eea36584bb 100644 --- a/test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml +++ b/test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml @@ -13,7 +13,7 @@ spec: matchLabels: color: blue containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 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 d2077626feb..a9ba48acadb 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: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml b/test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml index baa814defcb..08d374973fb 100644 --- a/test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml +++ b/test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml @@ -13,7 +13,7 @@ spec: matchLabels: color: blue containers: - - image: registry.k8s.io/pause:3.9 + - image: registry.k8s.io/pause:3.10 name: pause ports: - containerPort: 80 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 99d9e54e08f..517f483f42f 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -253,7 +253,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[Nonewprivs] = Config{list.PromoterE2eRegistry, "nonewprivs", "1.3"} configs[NonRoot] = Config{list.PromoterE2eRegistry, "nonroot", "1.4"} // Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go - configs[Pause] = Config{list.GcRegistry, "pause", "3.9"} + configs[Pause] = Config{list.GcRegistry, "pause", "3.10"} configs[Perl] = Config{list.PromoterE2eRegistry, "perl", "5.26"} configs[PrometheusDummyExporter] = Config{list.GcRegistry, "prometheus-dummy-exporter", "v0.1.0"} configs[PrometheusToSd] = Config{list.GcRegistry, "prometheus-to-sd", "v0.5.0"} diff --git a/test/utils/runners.go b/test/utils/runners.go index 41739a1a8f7..ad264a2b6d5 100644 --- a/test/utils/runners.go +++ b/test/utils/runners.go @@ -46,6 +46,7 @@ import ( "k8s.io/client-go/util/workqueue" api "k8s.io/kubernetes/pkg/apis/core" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" + imageutils "k8s.io/kubernetes/test/utils/image" "k8s.io/utils/pointer" "k8s.io/klog/v2" @@ -1211,7 +1212,7 @@ func MakePodSpec() v1.PodSpec { return v1.PodSpec{ Containers: []v1.Container{{ Name: "pause", - Image: "registry.k8s.io/pause:3.9", + Image: imageutils.GetE2EImage(imageutils.Pause), Ports: []v1.ContainerPort{{ContainerPort: 80}}, Resources: v1.ResourceRequirements{ Limits: v1.ResourceList{ @@ -1478,7 +1479,7 @@ type DaemonConfig struct { func (config *DaemonConfig) Run(ctx context.Context) error { if config.Image == "" { - config.Image = "registry.k8s.io/pause:3.9" + config.Image = imageutils.GetE2EImage(imageutils.Pause) } nameLabel := map[string]string{ "name": config.Name + "-daemon",