diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 3575af3f679..3d4b9bfd3b0 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -152,7 +152,7 @@ dependencies: match: TAG\s*\?= - name: "registry.k8s.io/pause: dependents" - version: 3.7 + version: 3.8 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 a9aa221d0cb..bc9870ed59c 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.7" +export WINDOWS_INFRA_CONTAINER="registry.k8s.io/pause:3.8" # 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 4e22bc84f8e..d30638a75b8 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -3092,7 +3092,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.7"}" + sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.8"}" [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 3fee4a2a8ff..e9a0648d97a 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.7 + image: registry.k8s.io/pause:3.8 nodeSelector: kubernetes.io/os: windows tolerations: diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 93ae37a62b8..fe17bfda318 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -421,7 +421,7 @@ const ( ModeNode string = "Node" // PauseVersion indicates the default pause image version for kubeadm - PauseVersion = "3.7" + PauseVersion = "3.8" // 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 167a2fa1861..c70f65ef520 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags_test.go +++ b/cmd/kubeadm/app/phases/kubelet/flags_test.go @@ -77,12 +77,12 @@ func TestBuildKubeletArgMap(t *testing.T) { nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{ CRISocket: "unix:///var/run/containerd/containerd.sock", }, - pauseImage: "registry.k8s.io/pause:3.7", + pauseImage: "registry.k8s.io/pause:3.8", }, expected: map[string]string{ "container-runtime": "remote", "container-runtime-endpoint": "unix:///var/run/containerd/containerd.sock", - "pod-infra-container-image": "registry.k8s.io/pause:3.7", + "pod-infra-container-image": "registry.k8s.io/pause:3.8", }, }, } diff --git a/cmd/kubeadm/app/util/template_test.go b/cmd/kubeadm/app/util/template_test.go index 75c6cdff5aa..b3b0b15f181 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.7" - validTmplOut = "image: registry.k8s.io/pause:3.7" - doNothing = "image: registry.k8s.io/pause:3.7" + validTmpl = "image: {{ .ImageRepository }}/pause:3.8" + validTmplOut = "image: registry.k8s.io/pause:3.8" + doNothing = "image: registry.k8s.io/pause:3.8" invalidTmpl1 = "{{ .baz }/d}" invalidTmpl2 = "{{ !foobar }}" ) diff --git a/cmd/kubelet/app/options/container_runtime.go b/cmd/kubelet/app/options/container_runtime.go index 19538c1246c..fc135fdca90 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.7" + defaultPodSandboxImageVersion = "3.8" ) var ( diff --git a/hack/testdata/filter/pod-apply-selector.yaml b/hack/testdata/filter/pod-apply-selector.yaml index 4d647daad5e..f9954eb5f28 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.7 + image: registry.k8s.io/pause:3.8 diff --git a/hack/testdata/filter/pod-dont-apply.yaml b/hack/testdata/filter/pod-dont-apply.yaml index e73e0d4c62f..25f4a62a11e 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.7 + image: registry.k8s.io/pause:3.8 diff --git a/hack/testdata/multi-resource-1.yaml b/hack/testdata/multi-resource-1.yaml index 53940ecf909..fb84d6a59ab 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.7 + image: registry.k8s.io/pause:3.8 --- apiVersion: v1 kind: Namespace diff --git a/hack/testdata/multi-resource-3.yaml b/hack/testdata/multi-resource-3.yaml index a612f835959..5a5dfc3abfa 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.7 + image: registry.k8s.io/pause:3.8 --- apiVersion: v1 kind: Pod @@ -17,7 +17,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.7 + image: registry.k8s.io/pause:3.8 --- apiVersion: v1 kind: Pod @@ -26,5 +26,5 @@ metadata: spec: containers: - name: kubernetes-pause - image: registry.k8s.io/pause:3.7 + image: registry.k8s.io/pause:3.8 diff --git a/hack/testdata/multi-resource-json-modify.json b/hack/testdata/multi-resource-json-modify.json index 5be38c6bee8..2c8f0c51880 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.7", + "image": "registry.k8s.io/pause:3.8", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-json.json b/hack/testdata/multi-resource-json.json index dc9d8f56e01..39aec66b279 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.7", + "image": "registry.k8s.io/pause:3.8", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list-modify.json b/hack/testdata/multi-resource-list-modify.json index b72d53318d0..0951c3b4149 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.7", + "image": "registry.k8s.io/pause:3.8", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list.json b/hack/testdata/multi-resource-list.json index 02d3af1b9b8..efd04a6f995 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.7", + "image": "registry.k8s.io/pause:3.8", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist-modify.json b/hack/testdata/multi-resource-rclist-modify.json index 3810049d497..c741f74b814 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.7", + "image": "registry.k8s.io/pause:3.8", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "registry.k8s.io/pause:3.7", + "image": "registry.k8s.io/pause:3.8", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist.json b/hack/testdata/multi-resource-rclist.json index 3810049d497..c741f74b814 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.7", + "image": "registry.k8s.io/pause:3.8", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "registry.k8s.io/pause:3.7", + "image": "registry.k8s.io/pause:3.8", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-yaml-modify.yaml b/hack/testdata/multi-resource-yaml-modify.yaml index 88e6cf6d1ee..b9a52e6b242 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.7 + image: registry.k8s.io/pause:3.8 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/multi-resource-yaml.yaml b/hack/testdata/multi-resource-yaml.yaml index 97b8aa43329..61ad444a2d4 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.7 + image: registry.k8s.io/pause:3.8 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/pod-apply.yaml b/hack/testdata/pod-apply.yaml index b476b9a8dcd..933fdae7ce2 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.7 + image: registry.k8s.io/pause:3.8 diff --git a/hack/testdata/pod-with-precision.json b/hack/testdata/pod-with-precision.json index fd37eeb8261..6ce2b44dea2 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.7" + "image": "registry.k8s.io/pause:3.8" } ], "restartPolicy": "Never", diff --git a/hack/testdata/pod.yaml b/hack/testdata/pod.yaml index 305688c5907..9fd23f8c237 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.7 + image: registry.k8s.io/pause:3.8 diff --git a/hack/testdata/prune/a.yaml b/hack/testdata/prune/a.yaml index 283e24da81f..85b8366d441 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.7 + image: registry.k8s.io/pause:3.8 diff --git a/hack/testdata/sorted-pods/sorted-pod1.yaml b/hack/testdata/sorted-pods/sorted-pod1.yaml index 401e077538b..c5e45e57dad 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.7 + image: registry.k8s.io/pause:3.8 resources: requests: memory: "64Mi" diff --git a/hack/testdata/sorted-pods/sorted-pod2.yaml b/hack/testdata/sorted-pods/sorted-pod2.yaml index d4a27eef8a0..5dbb46f79f5 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.7 + image: registry.k8s.io/pause:3.8 resources: requests: memory: "1G" diff --git a/hack/testdata/sorted-pods/sorted-pod3.yaml b/hack/testdata/sorted-pods/sorted-pod3.yaml index d3e7520fde1..9f39cc2d0c4 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.7 + image: registry.k8s.io/pause:3.8 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 d2465bbd656..2f5b6d8a657 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.7 + image: registry.k8s.io/pause:3.8 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: registry.k8s.io/pause:3.7 + image: registry.k8s.io/pause:3.8 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 290e548abe7..777997b301b 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.7 + image: registry.k8s.io/pause:3.8 diff --git a/test/cmd/core.sh b/test/cmd/core.sh index 8d4b84f73ac..a7945ca5bb8 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.7"}]}}' + 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"}]}}' # Post-condition: valid-pod POD has expected image - kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.7:' + kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.8:' # 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 048e1305da3..83314d73815 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.7" + - image: "registry.k8s.io/pause:3.8" 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 d2465bbd656..2f5b6d8a657 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.7 + image: registry.k8s.io/pause:3.8 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: registry.k8s.io/pause:3.7 + image: registry.k8s.io/pause:3.8 diff --git a/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml b/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml index 290e548abe7..777997b301b 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.7 + image: registry.k8s.io/pause:3.8 diff --git a/test/integration/benchmark-controller.json b/test/integration/benchmark-controller.json index b5f82c40a48..9f3c2b89045 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.7" + "image": "registry.k8s.io/pause:3.8" }] } } diff --git a/test/integration/scheduler_perf/config/churn/pod-default.yaml b/test/integration/scheduler_perf/config/churn/pod-default.yaml index a1b184353ce..e0b1f567414 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.7 + - image: registry.k8s.io/pause:3.8 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 1b95e94125c..2ad0cf279af 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.7 + - image: registry.k8s.io/pause:3.8 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 1fabc8b63f0..1ecc83c21be 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.7 + - image: registry.k8s.io/pause:3.8 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 e0304676e51..016fe3e8e09 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.7 + - image: registry.k8s.io/pause:3.8 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 a239062d399..e9f977335d2 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.7 + - image: registry.k8s.io/pause:3.8 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 75f7fd77e24..60fa71400ac 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.7 + - image: registry.k8s.io/pause:3.8 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 dbdada32dd7..d90f0184aee 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.7 + - image: registry.k8s.io/pause:3.8 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 74a6630f3c5..9424f126d2a 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.7 + - image: registry.k8s.io/pause:3.8 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 0f7361e3f6e..e209cc876fd 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.7 + - image: registry.k8s.io/pause:3.8 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 d508a86205e..008425d607b 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.7 + - image: registry.k8s.io/pause:3.8 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 c42bc4b5f12..171e8454658 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.7 + - image: registry.k8s.io/pause:3.8 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 3e7e3f9b313..160b361492d 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.7 + - image: registry.k8s.io/pause:3.8 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 7a59f60a315..f7cbf1659df 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.7 + - image: registry.k8s.io/pause:3.8 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 74c2ccc9491..947f7ff484d 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.7 + - image: registry.k8s.io/pause:3.8 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 a28ee578086..22ca82dcc56 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.7 + - image: registry.k8s.io/pause:3.8 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 12a4b70d08c..395722f6688 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.7 + - image: registry.k8s.io/pause:3.8 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 31eea51e7e7..f5507f4da54 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.7 + - image: registry.k8s.io/pause:3.8 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 3634262e7b9..16f65376edd 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.7 + - image: registry.k8s.io/pause:3.8 name: pause ports: - containerPort: 80 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index a185b83a97c..e5dc66ed598 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.7"} + configs[Pause] = Config{list.GcRegistry, "pause", "3.8"} 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 d3d37944f7c..45c269014a7 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.7", + Image: "registry.k8s.io/pause:3.8", 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.7" + config.Image = "registry.k8s.io/pause:3.8" } nameLabel := map[string]string{ "name": config.Name + "-daemon",