From 18936d47858b25d7de3bada57f70f1aa22981e75 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Sun, 29 Aug 2021 13:53:52 -0700 Subject: [PATCH] updates pause image references The pause:3.6 image has been published. Also updates older / incorrect references. --- build/dependencies.yaml | 2 +- build/pause/CHANGELOG.md | 4 ++++ cluster/gce/config-common.sh | 2 +- cluster/gce/windows/smoke-test.sh | 2 +- cmd/kubeadm/app/constants/constants.go | 2 +- cmd/kubeadm/app/phases/kubelet/flags_test.go | 4 ++-- cmd/kubeadm/app/util/template_test.go | 6 +++--- cmd/kubelet/app/options/container_runtime.go | 2 +- hack/testdata/filter/pod-apply-selector.yaml | 2 +- hack/testdata/filter/pod-dont-apply.yaml | 2 +- hack/testdata/multi-resource-1.yaml | 2 +- hack/testdata/multi-resource-3.yaml | 6 +++--- hack/testdata/multi-resource-json-modify.json | 2 +- hack/testdata/multi-resource-json.json | 2 +- hack/testdata/multi-resource-list-modify.json | 2 +- hack/testdata/multi-resource-list.json | 2 +- hack/testdata/multi-resource-rclist-modify.json | 4 ++-- hack/testdata/multi-resource-rclist.json | 4 ++-- hack/testdata/multi-resource-yaml-modify.yaml | 2 +- hack/testdata/multi-resource-yaml.yaml | 2 +- hack/testdata/pod-apply.yaml | 2 +- hack/testdata/pod-with-precision.json | 4 ++-- hack/testdata/pod.yaml | 2 +- hack/testdata/prune/a.yaml | 2 +- hack/testdata/prune/b.yaml | 2 +- hack/testdata/sorted-pods/sorted-pod1.yaml | 2 +- hack/testdata/sorted-pods/sorted-pod2.yaml | 2 +- hack/testdata/sorted-pods/sorted-pod3.yaml | 2 +- pkg/kubelet/dockershim/docker_sandbox.go | 2 +- .../k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml | 4 ++-- .../k8s.io/kubectl/testdata/set/namespaced-resource.yaml | 2 +- test/cmd/core.sh | 4 ++-- .../scheduling/nvidia-driver-installer.yaml | 2 +- test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml | 4 ++-- test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml | 2 +- test/integration/benchmark-controller.json | 2 +- .../scheduler_perf/config/churn/pod-default.yaml | 2 +- .../scheduler_perf/config/pod-affinity-ns-selector.yaml | 2 +- .../config/pod-anti-affinity-ns-selector.yaml | 2 +- test/integration/scheduler_perf/config/pod-default.yaml | 2 +- .../scheduler_perf/config/pod-high-priority-large-cpu.yaml | 2 +- .../scheduler_perf/config/pod-high-priority.yaml | 2 +- test/integration/scheduler_perf/config/pod-large-cpu.yaml | 2 +- .../integration/scheduler_perf/config/pod-low-priority.yaml | 2 +- .../config/pod-preferred-affinity-ns-selector.yaml | 2 +- .../config/pod-preferred-anti-affinity-ns-selector.yaml | 2 +- .../scheduler_perf/config/pod-with-node-affinity.yaml | 2 +- .../scheduler_perf/config/pod-with-pod-affinity.yaml | 2 +- .../scheduler_perf/config/pod-with-pod-anti-affinity.yaml | 2 +- .../config/pod-with-preferred-pod-affinity.yaml | 2 +- .../config/pod-with-preferred-pod-anti-affinity.yaml | 2 +- .../config/pod-with-preferred-topology-spreading.yaml | 2 +- .../scheduler_perf/config/pod-with-secret-volume.yaml | 2 +- .../scheduler_perf/config/pod-with-topology-spreading.yaml | 2 +- test/utils/image/manifest.go | 2 +- test/utils/runners.go | 4 ++-- 56 files changed, 71 insertions(+), 67 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index cd9589610bf..137414a5507 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -154,7 +154,7 @@ dependencies: match: TAG\s*\?= - name: "k8s.gcr.io/pause: dependents" - version: 3.5 + version: 3.6 refPaths: - path: cmd/kubeadm/app/constants/constants.go match: PauseVersion\s+= diff --git a/build/pause/CHANGELOG.md b/build/pause/CHANGELOG.md index 5fb4e51c34e..a1203ba9eca 100644 --- a/build/pause/CHANGELOG.md +++ b/build/pause/CHANGELOG.md @@ -1,3 +1,7 @@ +# 3.6 + +* Support for Windows container images (OS Versions: 2022) was added. ([#104438](https://github.com/kubernetes/kubernetes/pull/104438), [@nick5616](https://github.com/nick5616)) + # 3.5 * Run the container image as non root user per default ([#97963](https://github.com/kubernetes/kubernetes/pull/97963)) diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh index d24470576aa..383a6079dda 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.5" +export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.6" # 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/windows/smoke-test.sh b/cluster/gce/windows/smoke-test.sh index 2af63ec9141..b7d3d8fad4f 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.5 + image: k8s.gcr.io/pause:3.6 nodeSelector: kubernetes.io/os: windows tolerations: diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index df55609e90d..57550e32d3d 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -399,7 +399,7 @@ const ( ModeNode string = "Node" // PauseVersion indicates the default pause image version for kubeadm - PauseVersion = "3.5" + PauseVersion = "3.6" // 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 64b78742510..06a21b73357 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags_test.go +++ b/cmd/kubeadm/app/phases/kubelet/flags_test.go @@ -120,11 +120,11 @@ func TestBuildKubeletArgMap(t *testing.T) { nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{ CRISocket: "/var/run/dockershim.sock", }, - pauseImage: "gcr.io/pause:3.5", + pauseImage: "k8s.gcr.io/pause:3.6", }, expected: map[string]string{ "network-plugin": "cni", - "pod-infra-container-image": "gcr.io/pause:3.5", + "pod-infra-container-image": "k8s.gcr.io/pause:3.6", }, }, } diff --git a/cmd/kubeadm/app/util/template_test.go b/cmd/kubeadm/app/util/template_test.go index 67c985b21d7..ebdb1c14699 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.5" - validTmplOut = "image: k8s.gcr.io/pause:3.5" - doNothing = "image: k8s.gcr.io/pause:3.5" + validTmpl = "image: {{ .ImageRepository }}/pause:3.6" + validTmplOut = "image: k8s.gcr.io/pause:3.6" + doNothing = "image: k8s.gcr.io/pause:3.6" invalidTmpl1 = "{{ .baz }/d}" invalidTmpl2 = "{{ !foobar }}" ) diff --git a/cmd/kubelet/app/options/container_runtime.go b/cmd/kubelet/app/options/container_runtime.go index e557c113e52..f8e6bb520fd 100644 --- a/cmd/kubelet/app/options/container_runtime.go +++ b/cmd/kubelet/app/options/container_runtime.go @@ -28,7 +28,7 @@ import ( const ( // When these values are updated, also update test/utils/image/manifest.go defaultPodSandboxImageName = "k8s.gcr.io/pause" - defaultPodSandboxImageVersion = "3.5" + defaultPodSandboxImageVersion = "3.6" ) var ( diff --git a/hack/testdata/filter/pod-apply-selector.yaml b/hack/testdata/filter/pod-apply-selector.yaml index 44a1a189c89..daf76edc70d 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.5 + image: k8s.gcr.io/pause:3.6 diff --git a/hack/testdata/filter/pod-dont-apply.yaml b/hack/testdata/filter/pod-dont-apply.yaml index ae700539045..540fffde39c 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.5 + image: k8s.gcr.io/pause:3.6 diff --git a/hack/testdata/multi-resource-1.yaml b/hack/testdata/multi-resource-1.yaml index 69372ff24c5..a08c767e5c7 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.5 + image: k8s.gcr.io/pause:3.6 --- apiVersion: v1 kind: Namespace diff --git a/hack/testdata/multi-resource-3.yaml b/hack/testdata/multi-resource-3.yaml index 8151ff8eeb9..4bad481cfcd 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.5 + image: k8s.gcr.io/pause:3.6 --- apiVersion: v1 kind: Pod @@ -17,7 +17,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.5 + image: k8s.gcr.io/pause:3.6 --- apiVersion: v1 kind: Pod @@ -26,5 +26,5 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.5 + image: k8s.gcr.io/pause:3.6 diff --git a/hack/testdata/multi-resource-json-modify.json b/hack/testdata/multi-resource-json-modify.json index 356068c1710..53b4da0d23f 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.5", + "image": "k8s.gcr.io/pause:3.6", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-json.json b/hack/testdata/multi-resource-json.json index 5f2dde4b4e2..a38c6bd1de8 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.5", + "image": "k8s.gcr.io/pause:3.6", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list-modify.json b/hack/testdata/multi-resource-list-modify.json index 309ec7db1b8..37525285629 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.5", + "image": "k8s.gcr.io/pause:3.6", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list.json b/hack/testdata/multi-resource-list.json index c2f39331fde..e9c6b443fc7 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.5", + "image": "k8s.gcr.io/pause:3.6", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist-modify.json b/hack/testdata/multi-resource-rclist-modify.json index ffd093073e0..96baf8226fc 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.5", + "image": "k8s.gcr.io/pause:3.6", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:3.5", + "image": "k8s.gcr.io/pause:3.6", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist.json b/hack/testdata/multi-resource-rclist.json index ffd093073e0..96baf8226fc 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.5", + "image": "k8s.gcr.io/pause:3.6", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:3.5", + "image": "k8s.gcr.io/pause:3.6", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-yaml-modify.yaml b/hack/testdata/multi-resource-yaml-modify.yaml index 946315dd8b3..492b50a1ec3 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.5 + image: k8s.gcr.io/pause:3.6 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/multi-resource-yaml.yaml b/hack/testdata/multi-resource-yaml.yaml index 714abce4145..1d1f703888e 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.5 + image: k8s.gcr.io/pause:3.6 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/pod-apply.yaml b/hack/testdata/pod-apply.yaml index c79a372a863..9e8f926f7b8 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.5 + image: k8s.gcr.io/pause:3.6 diff --git a/hack/testdata/pod-with-precision.json b/hack/testdata/pod-with-precision.json index a92f995e297..b0e94b2da90 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.5" + "image": "k8s.gcr.io/pause:3.6" } ], "restartPolicy": "Never", @@ -21,4 +21,4 @@ ] } } -} \ No newline at end of file +} diff --git a/hack/testdata/pod.yaml b/hack/testdata/pod.yaml index e9589a8c3ec..787a2becdf5 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.5 + image: k8s.gcr.io/pause:3.6 diff --git a/hack/testdata/prune/a.yaml b/hack/testdata/prune/a.yaml index add1bc94b85..2b70446f986 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.5 + image: k8s.gcr.io/pause:3.6 diff --git a/hack/testdata/prune/b.yaml b/hack/testdata/prune/b.yaml index ca617bfd1d0..c722acd3ea4 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.5 + image: k8s.gcr.io/pause:3.6 diff --git a/hack/testdata/sorted-pods/sorted-pod1.yaml b/hack/testdata/sorted-pods/sorted-pod1.yaml index 9c6372f7dcd..3d00e52d894 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.5 + image: k8s.gcr.io/pause:3.6 resources: requests: memory: "64Mi" diff --git a/hack/testdata/sorted-pods/sorted-pod2.yaml b/hack/testdata/sorted-pods/sorted-pod2.yaml index c7406bec2bb..41f3b4ff59c 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.5 + image: k8s.gcr.io/pause:3.6 resources: requests: memory: "1G" diff --git a/hack/testdata/sorted-pods/sorted-pod3.yaml b/hack/testdata/sorted-pods/sorted-pod3.yaml index 916a52f1a93..408f0502796 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.5 + image: k8s.gcr.io/pause:3.6 diff --git a/pkg/kubelet/dockershim/docker_sandbox.go b/pkg/kubelet/dockershim/docker_sandbox.go index 2d2c274162f..8914786a91d 100644 --- a/pkg/kubelet/dockershim/docker_sandbox.go +++ b/pkg/kubelet/dockershim/docker_sandbox.go @@ -41,7 +41,7 @@ import ( ) const ( - defaultSandboxImage = "k8s.gcr.io/pause:3.5" + defaultSandboxImage = "k8s.gcr.io/pause:3.6" // Various default sandbox resources requests/limits. defaultSandboxCPUshares int64 = 2 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 d6c566ce241..a9c8754fe28 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.5 + image: k8s.gcr.io/pause:3.6 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.5 + image: k8s.gcr.io/pause:3.6 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 bdefabd17c8..49f494b89e3 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.5 + image: k8s.gcr.io/pause:3.6 diff --git a/test/cmd/core.sh b/test/cmd/core.sh index 6d2282c1ebd..ce037fe2f0e 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.5"}]}}' + 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"}]}}' # Post-condition: valid-pod POD has expected image - kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.5:' + kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.6:' # 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 e0217bbb3f2..061c934b5b8 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.5" + - image: "k8s.gcr.io/pause:3.6" 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 d6c566ce241..a9c8754fe28 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.5 + image: k8s.gcr.io/pause:3.6 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.5 + image: k8s.gcr.io/pause:3.6 diff --git a/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml b/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml index bdefabd17c8..49f494b89e3 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.5 + image: k8s.gcr.io/pause:3.6 diff --git a/test/integration/benchmark-controller.json b/test/integration/benchmark-controller.json index 1a28970ca87..debca232203 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.5" + "image": "k8s.gcr.io/pause:3.6" }] } } diff --git a/test/integration/scheduler_perf/config/churn/pod-default.yaml b/test/integration/scheduler_perf/config/churn/pod-default.yaml index 4b583d9a3b7..780bed60962 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.5 + - image: k8s.gcr.io/pause:3.6 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 e47560f6df6..7de3903306c 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.4.1 + - image: k8s.gcr.io/pause:3.6 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 40f8dd3a062..040cb07f55e 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.4.1 + - image: k8s.gcr.io/pause:3.6 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 873afa15be4..542eb9fade1 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.5 + - image: k8s.gcr.io/pause:3.6 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 06a6e6c2d8b..965d9f76287 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.2 + - image: k8s.gcr.io/pause:3.6 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 a8bb5383bf7..7d0bd92efaa 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.5 + - image: k8s.gcr.io/pause:3.6 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 c0e8e00f526..9531cf58599 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.5 + - image: k8s.gcr.io/pause:3.6 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 50779503cc5..fa0c7b00e1e 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.5 + - image: k8s.gcr.io/pause:3.6 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 9ff97485a6a..96b2a86b547 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.4.1 + - image: k8s.gcr.io/pause:3.6 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 b53017fafb8..4a9bcc1077e 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.4.1 + - image: k8s.gcr.io/pause:3.6 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 faaecd4b108..7f3ea7430b4 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.5 + - image: k8s.gcr.io/pause:3.6 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 b4af48bf8cb..a2c969e2e51 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-test", "sched-setup"] containers: - - image: k8s.gcr.io/pause:3.5 + - image: k8s.gcr.io/pause:3.6 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 302bacc7f6e..0b46e9e4d55 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-test", "sched-setup"] containers: - - image: k8s.gcr.io/pause:3.5 + - image: k8s.gcr.io/pause:3.6 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 4420c47eabc..d5640d0558d 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-test", "sched-setup"] weight: 1 containers: - - image: k8s.gcr.io/pause:3.5 + - image: k8s.gcr.io/pause:3.6 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 dd364d226d4..c3757bbd6fb 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-test", "sched-setup"] weight: 1 containers: - - image: k8s.gcr.io/pause:3.5 + - image: k8s.gcr.io/pause:3.6 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 2fe4c210e92..e61377f9104 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.5 + - image: k8s.gcr.io/pause:3.6 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 7281f1ca87c..40a18f3a150 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.5 + - image: k8s.gcr.io/pause:3.6 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 47821ae202a..44efe548ca4 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.5 + - image: k8s.gcr.io/pause:3.6 name: pause ports: - containerPort: 80 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index a3e054564a3..abecdd38f02 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -228,7 +228,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.1"} // Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go - configs[Pause] = Config{list.GcRegistry, "pause", "3.5"} + configs[Pause] = Config{list.GcRegistry, "pause", "3.6"} 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 42b9c6680f3..ee22eee1f50 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.5", + Image: "k8s.gcr.io/pause:3.6", 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.5" + config.Image = "k8s.gcr.io/pause:3.6" } nameLabel := map[string]string{ "name": config.Name + "-daemon",