diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 142499871cf..d3a7175f3b1 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -150,7 +150,7 @@ dependencies: match: TAG\s*\?= - name: "k8s.gcr.io/pause: dependents" - version: 3.6 + version: 3.7 refPaths: - path: cluster/gce/config-common.sh match: k8s.gcr.io\/pause:\d+\.\d+ diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh index 9f573a52d84..a2e1ae75e2b 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="k8s.gcr.io/pause:3.6" +export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.7" # 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 65aa18b3455..ba3ab881987 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -3087,7 +3087,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:-"k8s.gcr.io/pause:3.6"}" + sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"k8s.gcr.io/pause:3.7"}" [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 b7d3d8fad4f..49664f6f6e3 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: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 nodeSelector: kubernetes.io/os: windows tolerations: diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 289d6a90947..dc21edfe2dd 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -425,7 +425,7 @@ const ( ModeNode string = "Node" // PauseVersion indicates the default pause image version for kubeadm - PauseVersion = "3.6" + PauseVersion = "3.7" // 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 0b4256d7106..9286bf2a3de 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags_test.go +++ b/cmd/kubeadm/app/phases/kubelet/flags_test.go @@ -122,11 +122,11 @@ func TestBuildKubeletArgMap(t *testing.T) { nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{ CRISocket: "unix:///var/run/dockershim.sock", }, - pauseImage: "k8s.gcr.io/pause:3.6", + pauseImage: "k8s.gcr.io/pause:3.7", }, expected: map[string]string{ "network-plugin": "cni", - "pod-infra-container-image": "k8s.gcr.io/pause:3.6", + "pod-infra-container-image": "k8s.gcr.io/pause:3.7", }, }, { diff --git a/cmd/kubeadm/app/util/template_test.go b/cmd/kubeadm/app/util/template_test.go index ebdb1c14699..943774ceb32 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.6" - validTmplOut = "image: k8s.gcr.io/pause:3.6" - doNothing = "image: k8s.gcr.io/pause:3.6" + validTmpl = "image: {{ .ImageRepository }}/pause:3.7" + validTmplOut = "image: k8s.gcr.io/pause:3.7" + doNothing = "image: k8s.gcr.io/pause:3.7" invalidTmpl1 = "{{ .baz }/d}" invalidTmpl2 = "{{ !foobar }}" ) diff --git a/cmd/kubelet/app/options/container_runtime.go b/cmd/kubelet/app/options/container_runtime.go index 5ab831f31db..5c8b5e04eb7 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 = "k8s.gcr.io/pause" - defaultPodSandboxImageVersion = "3.6" + defaultPodSandboxImageVersion = "3.7" ) var ( diff --git a/hack/testdata/filter/pod-apply-selector.yaml b/hack/testdata/filter/pod-apply-selector.yaml index daf76edc70d..b53d7989366 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: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 diff --git a/hack/testdata/filter/pod-dont-apply.yaml b/hack/testdata/filter/pod-dont-apply.yaml index 540fffde39c..442d07a21eb 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: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 diff --git a/hack/testdata/multi-resource-1.yaml b/hack/testdata/multi-resource-1.yaml index a08c767e5c7..e85c092664d 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: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 --- apiVersion: v1 kind: Namespace diff --git a/hack/testdata/multi-resource-3.yaml b/hack/testdata/multi-resource-3.yaml index 4bad481cfcd..f5b7b1c51a5 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: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 --- apiVersion: v1 kind: Pod @@ -17,7 +17,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 --- apiVersion: v1 kind: Pod @@ -26,5 +26,5 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 diff --git a/hack/testdata/multi-resource-json-modify.json b/hack/testdata/multi-resource-json-modify.json index 53b4da0d23f..cb803d22e26 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": "k8s.gcr.io/pause:3.6", + "image": "k8s.gcr.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-json.json b/hack/testdata/multi-resource-json.json index a38c6bd1de8..0f144431b90 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": "k8s.gcr.io/pause:3.6", + "image": "k8s.gcr.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list-modify.json b/hack/testdata/multi-resource-list-modify.json index 37525285629..2c4ae0e73f1 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": "k8s.gcr.io/pause:3.6", + "image": "k8s.gcr.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list.json b/hack/testdata/multi-resource-list.json index e9c6b443fc7..8e9c46e1e9c 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": "k8s.gcr.io/pause:3.6", + "image": "k8s.gcr.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist-modify.json b/hack/testdata/multi-resource-rclist-modify.json index 96baf8226fc..9e18c42ae61 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": "k8s.gcr.io/pause:3.6", + "image": "k8s.gcr.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:3.6", + "image": "k8s.gcr.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist.json b/hack/testdata/multi-resource-rclist.json index 96baf8226fc..9e18c42ae61 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": "k8s.gcr.io/pause:3.6", + "image": "k8s.gcr.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:3.6", + "image": "k8s.gcr.io/pause:3.7", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-yaml-modify.yaml b/hack/testdata/multi-resource-yaml-modify.yaml index 492b50a1ec3..99a57b8e6ba 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: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/multi-resource-yaml.yaml b/hack/testdata/multi-resource-yaml.yaml index 1d1f703888e..6082685cf7f 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: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/pod-apply.yaml b/hack/testdata/pod-apply.yaml index 9e8f926f7b8..5d4dbf61ea9 100644 --- a/hack/testdata/pod-apply.yaml +++ b/hack/testdata/pod-apply.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 diff --git a/hack/testdata/pod-with-precision.json b/hack/testdata/pod-with-precision.json index b0e94b2da90..7aa39ad1a78 100644 --- a/hack/testdata/pod-with-precision.json +++ b/hack/testdata/pod-with-precision.json @@ -9,7 +9,7 @@ "containers": [ { "name": "kubernetes-pause", - "image": "k8s.gcr.io/pause:3.6" + "image": "k8s.gcr.io/pause:3.7" } ], "restartPolicy": "Never", diff --git a/hack/testdata/pod.yaml b/hack/testdata/pod.yaml index 787a2becdf5..53fda9c2ad5 100644 --- a/hack/testdata/pod.yaml +++ b/hack/testdata/pod.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 diff --git a/hack/testdata/prune/a.yaml b/hack/testdata/prune/a.yaml index 2b70446f986..94290bf67b3 100644 --- a/hack/testdata/prune/a.yaml +++ b/hack/testdata/prune/a.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 diff --git a/hack/testdata/prune/b.yaml b/hack/testdata/prune/b.yaml index c722acd3ea4..67a5e7076ee 100644 --- a/hack/testdata/prune/b.yaml +++ b/hack/testdata/prune/b.yaml @@ -8,4 +8,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 diff --git a/hack/testdata/sorted-pods/sorted-pod1.yaml b/hack/testdata/sorted-pods/sorted-pod1.yaml index 3d00e52d894..f937090b02e 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: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 resources: requests: memory: "64Mi" diff --git a/hack/testdata/sorted-pods/sorted-pod2.yaml b/hack/testdata/sorted-pods/sorted-pod2.yaml index 41f3b4ff59c..71cfe229b7b 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: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 resources: requests: memory: "1G" diff --git a/hack/testdata/sorted-pods/sorted-pod3.yaml b/hack/testdata/sorted-pods/sorted-pod3.yaml index 408f0502796..9f3386ba630 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: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 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 a9c8754fe28..32a0c06fece 100644 --- a/staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml +++ b/staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 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 49f494b89e3..b2253c8c5d1 100644 --- a/staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml +++ b/staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml @@ -14,4 +14,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 diff --git a/test/cmd/core.sh b/test/cmd/core.sh index ce037fe2f0e..8273908127e 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": "k8s.gcr.io/pause:3.6"}]}}' + kubectl patch "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "k8s.gcr.io/pause:3.7"}]}}' # Post-condition: valid-pod POD has expected image - kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.6:' + kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.7:' # 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 061c934b5b8..006ea283783 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: "k8s.gcr.io/pause:3.6" + - image: "k8s.gcr.io/pause:3.7" 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 a9c8754fe28..32a0c06fece 100644 --- a/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml +++ b/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 diff --git a/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml b/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml index 49f494b89e3..b2253c8c5d1 100644 --- a/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml +++ b/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml @@ -14,4 +14,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.6 + image: k8s.gcr.io/pause:3.7 diff --git a/test/integration/benchmark-controller.json b/test/integration/benchmark-controller.json index debca232203..b41fd97e646 100644 --- a/test/integration/benchmark-controller.json +++ b/test/integration/benchmark-controller.json @@ -17,7 +17,7 @@ "spec": { "containers": [{ "name": "test-container", - "image": "k8s.gcr.io/pause:3.6" + "image": "k8s.gcr.io/pause:3.7" }] } } diff --git a/test/integration/scheduler_perf/config/churn/pod-default.yaml b/test/integration/scheduler_perf/config/churn/pod-default.yaml index 780bed60962..72fcee3572b 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 7de3903306c..8e182c54284 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 040cb07f55e..1dc9dab609a 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 542eb9fade1..90d2128a3e7 100644 --- a/test/integration/scheduler_perf/config/pod-default.yaml +++ b/test/integration/scheduler_perf/config/pod-default.yaml @@ -4,7 +4,7 @@ metadata: generateName: pod- spec: containers: - - image: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 965d9f76287..4e5881e5a4a 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 7d0bd92efaa..d5091112700 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 9531cf58599..85a9364eefa 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 fa0c7b00e1e..64936fb42be 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 96b2a86b547..4fb4b8d51bd 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 4a9bcc1077e..5b0c680e790 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 7f3ea7430b4..8abc41005d6 100644 --- a/test/integration/scheduler_perf/config/pod-with-node-affinity.yaml +++ b/test/integration/scheduler_perf/config/pod-with-node-affinity.yaml @@ -14,7 +14,7 @@ spec: - zone1 - zone2 containers: - - image: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 401f1830d97..58305f94aa8 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 632d784c533..e95b4a669ef 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 33a86373042..c2a7946d537 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 40ef4489a08..556d0883924 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 e61377f9104..cc6c66cc630 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 40a18f3a150..f8b74a52c40 100644 --- a/test/integration/scheduler_perf/config/pod-with-secret-volume.yaml +++ b/test/integration/scheduler_perf/config/pod-with-secret-volume.yaml @@ -4,7 +4,7 @@ metadata: generateName: secret-volume- spec: containers: - - image: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 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 44efe548ca4..b58edeb3a73 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: k8s.gcr.io/pause:3.6 + - image: k8s.gcr.io/pause:3.7 name: pause ports: - containerPort: 80 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 113b9b99644..ede19194b28 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -260,7 +260,7 @@ func initImageConfigs(list RegistryList) (map[int]Config, map[int]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.6"} + configs[Pause] = Config{list.GcRegistry, "pause", "3.7"} 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 ee22eee1f50..05df7643255 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: "k8s.gcr.io/pause:3.6", + Image: "k8s.gcr.io/pause:3.7", 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 = "k8s.gcr.io/pause:3.6" + config.Image = "k8s.gcr.io/pause:3.7" } nameLabel := map[string]string{ "name": config.Name + "-daemon",