From bc2179d8824f41bce3e25bf563e7164989d094ea Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Fri, 3 Apr 2026 16:01:49 +0200 Subject: [PATCH] pause: fix version drift in various files The latest pause version is 3.10.2 but due to the introduction of the PATCH level version to the pause image (previously was only MAJOR.MINOR), various files have remained on an older version. Either 3.10 or 3.10.1. Our validation with build/dependencies.yaml ./hack/verify-external-dependencies.sh did not account for that. --- cluster/gce/config-common.sh | 2 +- cluster/gce/gci/configure-helper.sh | 2 +- cluster/gce/windows/smoke-test.sh | 2 +- cmd/kubeadm/app/constants/constants.go | 2 +- hack/testdata/pod-with-precision.json | 2 +- .../src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml | 4 ++-- .../src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml | 2 +- test/cmd/core.sh | 4 ++-- test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml | 4 ++-- test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml | 2 +- test/images/agnhost/fakeregistryserver/images.txt | 2 +- test/integration/benchmark-controller.json | 2 +- test/integration/scheduler_perf/templates/pod-default.yaml | 2 +- .../scheduler_perf/templates/pod-with-node-affinity.yaml | 2 +- .../scheduler_perf/templates/pod-with-pod-affinity.yaml | 2 +- .../scheduler_perf/templates/pod-with-pod-anti-affinity.yaml | 2 +- .../templates/pod-with-preferred-pod-affinity.yaml | 2 +- .../templates/pod-with-preferred-pod-anti-affinity.yaml | 2 +- .../templates/pod-with-preferred-topology-spreading.yaml | 2 +- .../scheduler_perf/templates/pod-with-secret-volume.yaml | 2 +- .../scheduler_perf/templates/pod-with-topology-spreading.yaml | 2 +- test/utils/image/manifest.go | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh index 79068939c42..b1d715f3c26 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.10" +export WINDOWS_INFRA_CONTAINER="registry.k8s.io/pause:3.10.2" # 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 4c78dfb6f9d..95c48129068 100755 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -3285,7 +3285,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.10"}" + sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.10.2"}" [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 cef074f74da..712e6bedf65 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.10 + image: registry.k8s.io/pause:3.10.2 nodeSelector: kubernetes.io/os: windows tolerations: diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 7c383dfdf51..02ef6eb5384 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -442,7 +442,7 @@ const ( ModeNode string = "Node" // PauseVersion indicates the default pause image version for kubeadm - PauseVersion = "3.10.1" + PauseVersion = "3.10.2" // CgroupDriverSystemd holds the systemd driver type CgroupDriverSystemd = "systemd" diff --git a/hack/testdata/pod-with-precision.json b/hack/testdata/pod-with-precision.json index 2312145d60f..ade9b8b1f7b 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.10.1" + "image": "registry.k8s.io/pause:3.10.2" } ], "restartPolicy": "Never", 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 dba096d7245..0e00ccda719 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.10 + image: registry.k8s.io/pause:3.10.2 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: registry.k8s.io/pause:3.10 + image: registry.k8s.io/pause:3.10.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 a619c6ae13c..b81cea4b24f 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.10 + image: registry.k8s.io/pause:3.10.2 diff --git a/test/cmd/core.sh b/test/cmd/core.sh index 1859b316062..acdb1ee5659 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.10.1"}]}}' + 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.2"}]}}' # Post-condition: valid-pod POD has expected image - kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.10.1:' + kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.10.2:' # 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/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml b/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml index b56666dc940..0e00ccda719 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.10.1 + image: registry.k8s.io/pause:3.10.2 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: registry.k8s.io/pause:3.10.1 + image: registry.k8s.io/pause:3.10.2 diff --git a/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml b/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml index 13eb76ece0a..b81cea4b24f 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.10.1 + image: registry.k8s.io/pause:3.10.2 diff --git a/test/images/agnhost/fakeregistryserver/images.txt b/test/images/agnhost/fakeregistryserver/images.txt index 6946c5f13ef..786f7c22eef 100644 --- a/test/images/agnhost/fakeregistryserver/images.txt +++ b/test/images/agnhost/fakeregistryserver/images.txt @@ -1 +1 @@ -pause 3.10.1 testing +pause 3.10.2 testing diff --git a/test/integration/benchmark-controller.json b/test/integration/benchmark-controller.json index 55c0fa8904a..bd5cf3401bc 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.10.1" + "image": "registry.k8s.io/pause:3.10.2" }] } } diff --git a/test/integration/scheduler_perf/templates/pod-default.yaml b/test/integration/scheduler_perf/templates/pod-default.yaml index 514cd7bbcd6..cf1f24b9b9a 100644 --- a/test/integration/scheduler_perf/templates/pod-default.yaml +++ b/test/integration/scheduler_perf/templates/pod-default.yaml @@ -4,7 +4,7 @@ metadata: generateName: pod- spec: containers: - - image: registry.k8s.io/pause:3.10.1 + - image: registry.k8s.io/pause:3.10.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/templates/pod-with-node-affinity.yaml b/test/integration/scheduler_perf/templates/pod-with-node-affinity.yaml index 819aeb11ba8..7fe311c677b 100644 --- a/test/integration/scheduler_perf/templates/pod-with-node-affinity.yaml +++ b/test/integration/scheduler_perf/templates/pod-with-node-affinity.yaml @@ -14,7 +14,7 @@ spec: - zone1 - zone2 containers: - - image: registry.k8s.io/pause:3.10.1 + - image: registry.k8s.io/pause:3.10.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/templates/pod-with-pod-affinity.yaml b/test/integration/scheduler_perf/templates/pod-with-pod-affinity.yaml index 852cb450a71..e7982a26a46 100644 --- a/test/integration/scheduler_perf/templates/pod-with-pod-affinity.yaml +++ b/test/integration/scheduler_perf/templates/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.10.1 + - image: registry.k8s.io/pause:3.10.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/templates/pod-with-pod-anti-affinity.yaml b/test/integration/scheduler_perf/templates/pod-with-pod-anti-affinity.yaml index 9fa9a85b022..eb3b308a317 100644 --- a/test/integration/scheduler_perf/templates/pod-with-pod-anti-affinity.yaml +++ b/test/integration/scheduler_perf/templates/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.10.1 + - image: registry.k8s.io/pause:3.10.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/templates/pod-with-preferred-pod-affinity.yaml b/test/integration/scheduler_perf/templates/pod-with-preferred-pod-affinity.yaml index 5bb449c42fd..8783429bd55 100644 --- a/test/integration/scheduler_perf/templates/pod-with-preferred-pod-affinity.yaml +++ b/test/integration/scheduler_perf/templates/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.10.1 + - image: registry.k8s.io/pause:3.10.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/templates/pod-with-preferred-pod-anti-affinity.yaml b/test/integration/scheduler_perf/templates/pod-with-preferred-pod-anti-affinity.yaml index 065380fe716..70d0384ef1f 100644 --- a/test/integration/scheduler_perf/templates/pod-with-preferred-pod-anti-affinity.yaml +++ b/test/integration/scheduler_perf/templates/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.10.1 + - image: registry.k8s.io/pause:3.10.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/templates/pod-with-preferred-topology-spreading.yaml b/test/integration/scheduler_perf/templates/pod-with-preferred-topology-spreading.yaml index fc8720a3a1c..87cac73fc64 100644 --- a/test/integration/scheduler_perf/templates/pod-with-preferred-topology-spreading.yaml +++ b/test/integration/scheduler_perf/templates/pod-with-preferred-topology-spreading.yaml @@ -13,7 +13,7 @@ spec: matchLabels: color: blue containers: - - image: registry.k8s.io/pause:3.10.1 + - image: registry.k8s.io/pause:3.10.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/templates/pod-with-secret-volume.yaml b/test/integration/scheduler_perf/templates/pod-with-secret-volume.yaml index 7b3905eee56..ed2c649b76f 100644 --- a/test/integration/scheduler_perf/templates/pod-with-secret-volume.yaml +++ b/test/integration/scheduler_perf/templates/pod-with-secret-volume.yaml @@ -4,7 +4,7 @@ metadata: generateName: secret-volume- spec: containers: - - image: registry.k8s.io/pause:3.10.1 + - image: registry.k8s.io/pause:3.10.2 name: pause ports: - containerPort: 80 diff --git a/test/integration/scheduler_perf/templates/pod-with-topology-spreading.yaml b/test/integration/scheduler_perf/templates/pod-with-topology-spreading.yaml index 073d20c4a3d..6fa6074b387 100644 --- a/test/integration/scheduler_perf/templates/pod-with-topology-spreading.yaml +++ b/test/integration/scheduler_perf/templates/pod-with-topology-spreading.yaml @@ -13,7 +13,7 @@ spec: matchLabels: color: blue containers: - - image: registry.k8s.io/pause:3.10.1 + - image: registry.k8s.io/pause:3.10.2 name: pause ports: - containerPort: 80 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index d17bbc9157e..cfaa6877d0f 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -230,7 +230,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[Nonewprivs] = Config{list.PromoterE2eRegistry, "nonewprivs", "1.4"} configs[NonRoot] = Config{list.PromoterE2eRegistry, "nonroot", "1.5"} // Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go - configs[Pause] = Config{list.GcRegistry, "pause", "3.10.1"} + configs[Pause] = Config{list.GcRegistry, "pause", "3.10.2"} configs[Perl] = Config{list.PromoterE2eRegistry, "perl", "5.26"} configs[RegressionIssue74839] = Config{list.PromoterE2eRegistry, "regression-issue-74839", "1.4"} configs[ResourceConsumer] = Config{list.PromoterE2eRegistry, "resource-consumer", "1.14"}