diff --git a/build/dependencies.yaml b/build/dependencies.yaml index d6e6cf11cf8..1fc7ad2d5ab 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -151,7 +151,7 @@ dependencies: match: TAG\s*\?= - name: "registry.k8s.io/pause: dependents" - version: 3.8 + version: 3.9 refPaths: - path: cluster/gce/config-common.sh match: registry.k8s.io\/pause:\d+\.\d+ diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh index bc9870ed59c..5b14a69110a 100644 --- a/cluster/gce/config-common.sh +++ b/cluster/gce/config-common.sh @@ -160,7 +160,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.8" +export WINDOWS_INFRA_CONTAINER="registry.k8s.io/pause:3.9" # 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 d8ac2673a5d..df3af6a7940 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -3203,7 +3203,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.8"}" + sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.9"}" [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 e9a0648d97a..cc4fbed5673 100755 --- a/cluster/gce/windows/smoke-test.sh +++ b/cluster/gce/windows/smoke-test.sh @@ -358,7 +358,7 @@ spec: spec: containers: - name: pause-win - image: registry.k8s.io/pause:3.8 + image: registry.k8s.io/pause:3.9 nodeSelector: kubernetes.io/os: windows tolerations: diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 487900c9a37..b87d11284b4 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -417,7 +417,7 @@ const ( ModeNode string = "Node" // PauseVersion indicates the default pause image version for kubeadm - PauseVersion = "3.8" + PauseVersion = "3.9" // 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 2edb0e0844b..6c0d8116a3a 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags_test.go +++ b/cmd/kubeadm/app/phases/kubelet/flags_test.go @@ -77,11 +77,11 @@ func TestBuildKubeletArgMap(t *testing.T) { nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{ CRISocket: "unix:///var/run/containerd/containerd.sock", }, - pauseImage: "registry.k8s.io/pause:3.8", + pauseImage: "registry.k8s.io/pause:3.9", }, expected: map[string]string{ "container-runtime-endpoint": "unix:///var/run/containerd/containerd.sock", - "pod-infra-container-image": "registry.k8s.io/pause:3.8", + "pod-infra-container-image": "registry.k8s.io/pause:3.9", }, }, } diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go b/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go index b430463b1b0..9aee53a7a57 100644 --- a/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go @@ -111,8 +111,8 @@ func TestCleanupKubeletDynamicEnvFileContainerRuntime(t *testing.T) { }{ { name: "common flag", - input: fmt.Sprintf("%s=\"--container-runtime=remote --container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --pod-infra-container-image=registry.k8s.io/pause:3.8\"", constants.KubeletEnvFileVariableName), - expected: fmt.Sprintf("%s=\"--container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --pod-infra-container-image=registry.k8s.io/pause:3.8\"", constants.KubeletEnvFileVariableName), + input: fmt.Sprintf("%s=\"--container-runtime=remote --container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --pod-infra-container-image=registry.k8s.io/pause:3.9\"", constants.KubeletEnvFileVariableName), + expected: fmt.Sprintf("%s=\"--container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --pod-infra-container-image=registry.k8s.io/pause:3.9\"", constants.KubeletEnvFileVariableName), }, { name: "missing flag of interest", diff --git a/cmd/kubeadm/app/util/template_test.go b/cmd/kubeadm/app/util/template_test.go index b3b0b15f181..9fb8a224b15 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.8" - validTmplOut = "image: registry.k8s.io/pause:3.8" - doNothing = "image: registry.k8s.io/pause:3.8" + validTmpl = "image: {{ .ImageRepository }}/pause:3.9" + validTmplOut = "image: registry.k8s.io/pause:3.9" + doNothing = "image: registry.k8s.io/pause:3.9" invalidTmpl1 = "{{ .baz }/d}" invalidTmpl2 = "{{ !foobar }}" ) diff --git a/cmd/kubelet/app/options/container_runtime.go b/cmd/kubelet/app/options/container_runtime.go index fc135fdca90..795594b6a13 100644 --- a/cmd/kubelet/app/options/container_runtime.go +++ b/cmd/kubelet/app/options/container_runtime.go @@ -24,7 +24,7 @@ import ( const ( // When these values are updated, also update test/utils/image/manifest.go defaultPodSandboxImageName = "registry.k8s.io/pause" - defaultPodSandboxImageVersion = "3.8" + defaultPodSandboxImageVersion = "3.9" ) var ( diff --git a/hack/testdata/filter/pod-apply-selector.yaml b/hack/testdata/filter/pod-apply-selector.yaml index f9954eb5f28..ca4119ed559 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.8 + image: registry.k8s.io/pause:3.9 diff --git a/hack/testdata/filter/pod-dont-apply.yaml b/hack/testdata/filter/pod-dont-apply.yaml index 25f4a62a11e..438a7fd68d7 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.8 + image: registry.k8s.io/pause:3.9 diff --git a/hack/testdata/multi-resource-1.yaml b/hack/testdata/multi-resource-1.yaml index fb84d6a59ab..714292e71b8 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.8 + image: registry.k8s.io/pause:3.9 --- apiVersion: v1 kind: Namespace diff --git a/hack/testdata/multi-resource-3.yaml b/hack/testdata/multi-resource-3.yaml index 5a5dfc3abfa..8516579b474 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.8 + image: registry.k8s.io/pause:3.9 --- apiVersion: v1 kind: Pod @@ -17,7 +17,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.8 + image: registry.k8s.io/pause:3.9 --- apiVersion: v1 kind: Pod @@ -26,5 +26,5 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.8 + image: registry.k8s.io/pause:3.9 diff --git a/hack/testdata/multi-resource-json-modify.json b/hack/testdata/multi-resource-json-modify.json index 2c8f0c51880..505f3c2c180 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.8", + "image": "registry.k8s.io/pause:3.9", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-json.json b/hack/testdata/multi-resource-json.json index 39aec66b279..bca942f8676 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.8", + "image": "registry.k8s.io/pause:3.9", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list-modify.json b/hack/testdata/multi-resource-list-modify.json index 0951c3b4149..458b865d20f 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.8", + "image": "registry.k8s.io/pause:3.9", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list.json b/hack/testdata/multi-resource-list.json index efd04a6f995..0687a0ad46a 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.8", + "image": "registry.k8s.io/pause:3.9", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist-modify.json b/hack/testdata/multi-resource-rclist-modify.json index c741f74b814..da770f54a2e 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.8", + "image": "registry.k8s.io/pause:3.9", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "registry.k8s.io/pause:3.8", + "image": "registry.k8s.io/pause:3.9", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist.json b/hack/testdata/multi-resource-rclist.json index c741f74b814..da770f54a2e 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.8", + "image": "registry.k8s.io/pause:3.9", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "registry.k8s.io/pause:3.8", + "image": "registry.k8s.io/pause:3.9", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-yaml-modify.yaml b/hack/testdata/multi-resource-yaml-modify.yaml index b9a52e6b242..47489df5a8d 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.8 + image: registry.k8s.io/pause:3.9 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/multi-resource-yaml.yaml b/hack/testdata/multi-resource-yaml.yaml index 61ad444a2d4..71892eabbdc 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.8 + image: registry.k8s.io/pause:3.9 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/pod-apply.yaml b/hack/testdata/pod-apply.yaml index 933fdae7ce2..732e9a5b8e1 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.8 + image: registry.k8s.io/pause:3.9 diff --git a/hack/testdata/pod-with-precision.json b/hack/testdata/pod-with-precision.json index 6ce2b44dea2..ff96cd7cee3 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.8" + "image": "registry.k8s.io/pause:3.9" } ], "restartPolicy": "Never", diff --git a/hack/testdata/pod.yaml b/hack/testdata/pod.yaml index 9fd23f8c237..3e70b993017 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.8 + image: registry.k8s.io/pause:3.9 diff --git a/hack/testdata/prune/a.yaml b/hack/testdata/prune/a.yaml index 85b8366d441..92aadbc280c 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.8 + image: registry.k8s.io/pause:3.9 diff --git a/hack/testdata/sorted-pods/sorted-pod1.yaml b/hack/testdata/sorted-pods/sorted-pod1.yaml index c5e45e57dad..fa7d4823236 100644 --- a/hack/testdata/sorted-pods/sorted-pod1.yaml +++ b/hack/testdata/sorted-pods/sorted-pod1.yaml @@ -8,7 +8,7 @@ metadata: spec: containers: - name: kubernetes-pause2 - image: registry.k8s.io/pause:3.8 + image: registry.k8s.io/pause:3.9 resources: requests: memory: "64Mi" diff --git a/hack/testdata/sorted-pods/sorted-pod2.yaml b/hack/testdata/sorted-pods/sorted-pod2.yaml index 5dbb46f79f5..bc21f7c50bc 100644 --- a/hack/testdata/sorted-pods/sorted-pod2.yaml +++ b/hack/testdata/sorted-pods/sorted-pod2.yaml @@ -8,7 +8,7 @@ metadata: spec: containers: - name: kubernetes-pause1 - image: registry.k8s.io/pause:3.8 + image: registry.k8s.io/pause:3.9 resources: requests: memory: "1G" diff --git a/hack/testdata/sorted-pods/sorted-pod3.yaml b/hack/testdata/sorted-pods/sorted-pod3.yaml index 9f39cc2d0c4..b0fe57bb5f2 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.8 + image: registry.k8s.io/pause:3.9 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 2f5b6d8a657..74ac7d76af0 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.8 + image: registry.k8s.io/pause:3.9 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: registry.k8s.io/pause:3.8 + image: registry.k8s.io/pause:3.9 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 777997b301b..fba31a6ac04 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.8 + image: registry.k8s.io/pause:3.9 diff --git a/test/cmd/core.sh b/test/cmd/core.sh index a169842e2f4..1ce79d8188a 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.8"}]}}' + 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"}]}}' # Post-condition: valid-pod POD has expected image - kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.8:' + kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.9:' # 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/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml b/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml index 926779e6895..f69371b933a 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.8" + - image: "registry.k8s.io/pause:3.9" 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 2f5b6d8a657..74ac7d76af0 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.8 + image: registry.k8s.io/pause:3.9 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: registry.k8s.io/pause:3.8 + image: registry.k8s.io/pause:3.9 diff --git a/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml b/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml index 777997b301b..fba31a6ac04 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.8 + image: registry.k8s.io/pause:3.9 diff --git a/test/integration/benchmark-controller.json b/test/integration/benchmark-controller.json index 9f3c2b89045..0da0865a2ae 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.8" + "image": "registry.k8s.io/pause:3.9" }] } } diff --git a/test/integration/scheduler_perf/config/churn/pod-default.yaml b/test/integration/scheduler_perf/config/churn/pod-default.yaml index e0b1f567414..8b749f6e084 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.8 + - image: registry.k8s.io/pause:3.9 name: pause 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 2ad0cf279af..f4e027b45d8 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.8 + - image: registry.k8s.io/pause:3.9 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 1ecc83c21be..d3ce319a8af 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.8 + - image: registry.k8s.io/pause:3.9 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 016fe3e8e09..00bb31904f2 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.8 + - image: registry.k8s.io/pause:3.9 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 e9f977335d2..2b665e2e625 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.8 + - image: registry.k8s.io/pause:3.9 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 60fa71400ac..518ba19541f 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.8 + - image: registry.k8s.io/pause:3.9 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 d90f0184aee..97ffc035b1d 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.8 + - image: registry.k8s.io/pause:3.9 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 9424f126d2a..16149c8bfb9 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.8 + - image: registry.k8s.io/pause:3.9 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 e209cc876fd..b197b3f1f42 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.8 + - image: registry.k8s.io/pause:3.9 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 008425d607b..0c544d5550f 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.8 + - image: registry.k8s.io/pause:3.9 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 171e8454658..b9c6a1cdff7 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.8 + - image: registry.k8s.io/pause:3.9 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 f304a3306de..5b1da5716fe 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.8 + - image: registry.k8s.io/pause:3.9 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 160b361492d..e1db1fce7c7 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.8 + - image: registry.k8s.io/pause:3.9 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 f7cbf1659df..e39d6c7a600 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.8 + - image: registry.k8s.io/pause:3.9 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 947f7ff484d..a2ba25365e7 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.8 + - image: registry.k8s.io/pause:3.9 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 22ca82dcc56..2da786e2256 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.8 + - image: registry.k8s.io/pause:3.9 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 395722f6688..87a597cf161 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.8 + - image: registry.k8s.io/pause:3.9 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 f5507f4da54..d2077626feb 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.8 + - image: registry.k8s.io/pause:3.9 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 16f65376edd..baa814defcb 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.8 + - image: registry.k8s.io/pause:3.9 name: pause ports: - containerPort: 80 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index abaf47f95bb..c4e2466a1d0 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -259,7 +259,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.2"} // Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go - configs[Pause] = Config{list.GcRegistry, "pause", "3.8"} + configs[Pause] = Config{list.GcRegistry, "pause", "3.9"} 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 45c269014a7..344e7fc54c7 100644 --- a/test/utils/runners.go +++ b/test/utils/runners.go @@ -1319,7 +1319,7 @@ func MakePodSpec() v1.PodSpec { return v1.PodSpec{ Containers: []v1.Container{{ Name: "pause", - Image: "registry.k8s.io/pause:3.8", + Image: "registry.k8s.io/pause:3.9", Ports: []v1.ContainerPort{{ContainerPort: 80}}, Resources: v1.ResourceRequirements{ Limits: v1.ResourceList{ @@ -1741,7 +1741,7 @@ type DaemonConfig struct { func (config *DaemonConfig) Run() error { if config.Image == "" { - config.Image = "registry.k8s.io/pause:3.8" + config.Image = "registry.k8s.io/pause:3.9" } nameLabel := map[string]string{ "name": config.Name + "-daemon",