diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 6779076e81b..54a6b002a2c 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -160,9 +160,9 @@ dependencies: match: TAG = - name: "k8s.gcr.io/pause: dependents" - version: 3.2 + version: 3.4.1 refPaths: - - path: cmd/kubeadm/app/constants/constants_unix.go + - path: cmd/kubeadm/app/constants/constants.go match: PauseVersion\s+= - path: cmd/kubeadm/app/util/template_test.go match: validTmpl\s+= @@ -209,7 +209,7 @@ dependencies: - path: test/utils/runners.go match: k8s.gcr.io\/pause:\d+\.\d+ - path: test/utils/image/manifest.go - match: configs\[Pause\] = Config{gcRegistry, "pause", "\d+\.\d+"} + match: configs\[Pause\] = Config{gcRegistry, "pause", "\d+\.\d+.\d+"} # metadata-concealment: bump this one first - name: "metadata-concealment" diff --git a/build/pause/CHANGELOG.md b/build/pause/CHANGELOG.md index 1cf2af85103..630a46e698f 100644 --- a/build/pause/CHANGELOG.md +++ b/build/pause/CHANGELOG.md @@ -1,3 +1,15 @@ +# 3.4.1 + +* Support for Windows container images (OS Versions: 20H2) was added.([#97322](https://prs.k8s.io/97322), [@claudiubelu](https://github.com/claudiubelu)) + +# 3.4 + +* Support for Windows container images (OS Versions: 1809, 1903, 1909, 2004) was added. ([#91452](https://prs.k8s.io/91452), [@claudiubelu](https://github.com/claudiubelu)) + +# 3.3 + +* update debian-base version to v2.1.0 ([#90665](https://prs.k8s.io/90665), [@justaugustus] + # 3.2 * The pause container is built with the correct "Architecture" metadata. ([#87954](https://prs.k8s.io/87954), [@BenTheElder](https://github.com/BenTheElder)) diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh index 9dc6fa61a72..6f603fb0fdb 100644 --- a/cluster/gce/config-common.sh +++ b/cluster/gce/config-common.sh @@ -158,7 +158,7 @@ export WINDOWS_BOOTSTRAP_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubelet.bootstrap-k # Path for kube-proxy kubeconfig file on Windows nodes. export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfig" # Pause container image for Windows container. -export WINDOWS_INFRA_CONTAINER="gcr.io/gke-release/pause-win:1.5.1" +export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.4.1" # 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 23ab2999768..72e741b25b2 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: gcr.io/gke-release/pause-win:1.5.1 + image: k8s.gcr.io/pause:3.4.1 nodeSelector: kubernetes.io/os: windows tolerations: diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 57ddbcc5764..228ef196553 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -414,6 +414,9 @@ const ( ModeRBAC string = "RBAC" // ModeNode is an authorization mode that authorizes API requests made by kubelets. ModeNode string = "Node" + + // PauseVersion indicates the default pause image version for kubeadm + PauseVersion = "3.4.1" ) var ( diff --git a/cmd/kubeadm/app/constants/constants_unix.go b/cmd/kubeadm/app/constants/constants_unix.go index b024348c29a..16ff72d5556 100644 --- a/cmd/kubeadm/app/constants/constants_unix.go +++ b/cmd/kubeadm/app/constants/constants_unix.go @@ -21,7 +21,4 @@ package constants const ( // DefaultDockerCRISocket defines the default Docker CRI socket DefaultDockerCRISocket = "/var/run/dockershim.sock" - - // PauseVersion indicates the default pause image version for kubeadm - PauseVersion = "3.2" ) diff --git a/cmd/kubeadm/app/constants/constants_windows.go b/cmd/kubeadm/app/constants/constants_windows.go index e8b2494490a..6daae0a1fff 100644 --- a/cmd/kubeadm/app/constants/constants_windows.go +++ b/cmd/kubeadm/app/constants/constants_windows.go @@ -21,7 +21,4 @@ package constants const ( // DefaultDockerCRISocket defines the default Docker CRI socket DefaultDockerCRISocket = "npipe:////./pipe/docker_engine" - - // PauseVersion indicates the default pause image version for kubeadm - PauseVersion = "1.4.0" ) diff --git a/cmd/kubeadm/app/images/BUILD b/cmd/kubeadm/app/images/BUILD index cafd5e84f43..a4b8b898ddb 100644 --- a/cmd/kubeadm/app/images/BUILD +++ b/cmd/kubeadm/app/images/BUILD @@ -8,23 +8,14 @@ load( go_library( name = "go_default_library", - srcs = [ - "images.go", - "images_unix.go", - "images_windows.go", - ], + srcs = ["images.go"], importpath = "k8s.io/kubernetes/cmd/kubeadm/app/images", deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", "//cmd/kubeadm/app/util:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", - ] + select({ - "@io_bazel_rules_go//go/platform:windows": [ - "//cmd/kubeadm/app/apis/kubeadm/v1beta2:go_default_library", - ], - "//conditions:default": [], - }), + ], ) go_test( diff --git a/cmd/kubeadm/app/images/images.go b/cmd/kubeadm/app/images/images.go index ddb2a615790..88ab0cb91bc 100644 --- a/cmd/kubeadm/app/images/images.go +++ b/cmd/kubeadm/app/images/images.go @@ -121,3 +121,8 @@ func GetControlPlaneImages(cfg *kubeadmapi.ClusterConfiguration) []string { return imgs } + +// GetPauseImage returns the image for the "pause" container +func GetPauseImage(cfg *kubeadmapi.ClusterConfiguration) string { + return GetGenericImage(cfg.ImageRepository, "pause", constants.PauseVersion) +} diff --git a/cmd/kubeadm/app/images/images_unix.go b/cmd/kubeadm/app/images/images_unix.go deleted file mode 100644 index 43fa63e88cf..00000000000 --- a/cmd/kubeadm/app/images/images_unix.go +++ /dev/null @@ -1,29 +0,0 @@ -// +build !windows - -/* -Copyright 2020 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package images - -import ( - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" -) - -// GetPauseImage returns the image for the "pause" container -func GetPauseImage(cfg *kubeadmapi.ClusterConfiguration) string { - return GetGenericImage(cfg.ImageRepository, "pause", constants.PauseVersion) -} diff --git a/cmd/kubeadm/app/images/images_windows.go b/cmd/kubeadm/app/images/images_windows.go deleted file mode 100644 index f3c084a9483..00000000000 --- a/cmd/kubeadm/app/images/images_windows.go +++ /dev/null @@ -1,34 +0,0 @@ -// +build windows - -/* -Copyright 2020 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package images - -import ( - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" -) - -// GetPauseImage returns the image for the "pause" container -func GetPauseImage(cfg *kubeadmapi.ClusterConfiguration) string { - //If user has configured the cluster to use a different image repository, use that for the Windows pause image. - if cfg.ImageRepository != kubeadmapiv1beta2.DefaultImageRepository { - return GetGenericImage(cfg.ImageRepository, "pause", constants.PauseVersion) - } - return GetGenericImage("mcr.microsoft.com/oss/kubernetes", "pause", constants.PauseVersion) -} diff --git a/cmd/kubeadm/app/phases/kubelet/flags_test.go b/cmd/kubeadm/app/phases/kubelet/flags_test.go index 4917a65f8c8..50a04588823 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags_test.go +++ b/cmd/kubeadm/app/phases/kubelet/flags_test.go @@ -119,11 +119,11 @@ func TestBuildKubeletArgMap(t *testing.T) { nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{ CRISocket: "/var/run/dockershim.sock", }, - pauseImage: "gcr.io/pause:3.2", + pauseImage: "gcr.io/pause:3.4.1", }, expected: map[string]string{ "network-plugin": "cni", - "pod-infra-container-image": "gcr.io/pause:3.2", + "pod-infra-container-image": "gcr.io/pause:3.4.1", }, }, } diff --git a/cmd/kubeadm/app/util/template_test.go b/cmd/kubeadm/app/util/template_test.go index c2dd0ed2454..3550f8f4f9e 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.2" - validTmplOut = "image: k8s.gcr.io/pause:3.2" - doNothing = "image: k8s.gcr.io/pause:3.2" + validTmpl = "image: {{ .ImageRepository }}/pause:3.4.1" + validTmplOut = "image: k8s.gcr.io/pause:3.4.1" + doNothing = "image: k8s.gcr.io/pause:3.4.1" invalidTmpl1 = "{{ .baz }/d}" invalidTmpl2 = "{{ !foobar }}" ) diff --git a/cmd/kubelet/app/options/container_runtime.go b/cmd/kubelet/app/options/container_runtime.go index b58953b88ef..a3be109f649 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.2" + defaultPodSandboxImageVersion = "3.4.1" ) var ( diff --git a/hack/testdata/filter/pod-apply-selector.yaml b/hack/testdata/filter/pod-apply-selector.yaml index f296b68b9af..67f21b797fe 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:2.0 + image: k8s.gcr.io/pause:3.4.1 diff --git a/hack/testdata/filter/pod-dont-apply.yaml b/hack/testdata/filter/pod-dont-apply.yaml index 9b8f9f6e900..9a272bf094e 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:2.0 + image: k8s.gcr.io/pause:3.4.1 diff --git a/hack/testdata/multi-resource-1.yaml b/hack/testdata/multi-resource-1.yaml index 7acb111c78d..7062a4a9ef2 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:2.0 + image: k8s.gcr.io/pause:3.4.1 --- apiVersion: v1 kind: Namespace diff --git a/hack/testdata/multi-resource-3.yaml b/hack/testdata/multi-resource-3.yaml index 10929c63a82..1f1f5cf7151 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:2.0 + image: k8s.gcr.io/pause:3.4.1 --- apiVersion: v1 kind: Pod @@ -17,7 +17,7 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:2.0 + image: k8s.gcr.io/pause:3.4.1 --- apiVersion: v1 kind: Pod @@ -26,5 +26,5 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:2.0 + image: k8s.gcr.io/pause:3.4.1 diff --git a/hack/testdata/multi-resource-json-modify.json b/hack/testdata/multi-resource-json-modify.json index 2f88c0ac8e3..a5b063a95c5 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:2.0", + "image": "k8s.gcr.io/pause:3.4.1", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-json.json b/hack/testdata/multi-resource-json.json index 869fdc7cbfc..05a0496bdb2 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:2.0", + "image": "k8s.gcr.io/pause:3.4.1", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list-modify.json b/hack/testdata/multi-resource-list-modify.json index af902efcfc3..43041d6a010 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:2.0", + "image": "k8s.gcr.io/pause:3.4.1", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-list.json b/hack/testdata/multi-resource-list.json index 17abca285aa..b0c193d6d97 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:2.0", + "image": "k8s.gcr.io/pause:3.4.1", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist-modify.json b/hack/testdata/multi-resource-rclist-modify.json index a28169c8ee5..72d4312ca7c 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:2.0", + "image": "k8s.gcr.io/pause:3.4.1", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:2.0", + "image": "k8s.gcr.io/pause:3.4.1", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-rclist.json b/hack/testdata/multi-resource-rclist.json index a28169c8ee5..72d4312ca7c 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:2.0", + "image": "k8s.gcr.io/pause:3.4.1", "ports":[{ "containerPort":9949, "protocol":"TCP" @@ -60,7 +60,7 @@ "spec":{ "containers":[{ "name": "mock-container", - "image": "k8s.gcr.io/pause:2.0", + "image": "k8s.gcr.io/pause:3.4.1", "ports":[{ "containerPort":9949, "protocol":"TCP" diff --git a/hack/testdata/multi-resource-yaml-modify.yaml b/hack/testdata/multi-resource-yaml-modify.yaml index 067b75630ba..b8492f069d9 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:2.0 + image: k8s.gcr.io/pause:3.4.1 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/multi-resource-yaml.yaml b/hack/testdata/multi-resource-yaml.yaml index 642ebdb47ed..7aab9d45da9 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:2.0 + image: k8s.gcr.io/pause:3.4.1 ports: - containerPort: 9949 protocol: TCP diff --git a/hack/testdata/pod-apply.yaml b/hack/testdata/pod-apply.yaml index 235d1c8f0f3..66e9a5fddf1 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:2.0 + image: k8s.gcr.io/pause:3.4.1 diff --git a/hack/testdata/pod-changed.yaml b/hack/testdata/pod-changed.yaml index 69476100d3f..f08c34cf095 100644 --- a/hack/testdata/pod-changed.yaml +++ b/hack/testdata/pod-changed.yaml @@ -7,4 +7,4 @@ metadata: spec: containers: - name: kubernetes-pause - image: k8s.gcr.io/pause:3.0 + image: k8s.gcr.io/pause:3.4 diff --git a/hack/testdata/pod-with-precision.json b/hack/testdata/pod-with-precision.json index 2b501eba82c..317ebd7920d 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.2" + "image": "k8s.gcr.io/pause:3.4.1" } ], "restartPolicy": "Never", diff --git a/hack/testdata/pod.yaml b/hack/testdata/pod.yaml index 92b504ef77a..d29421d9f79 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:2.0 + image: k8s.gcr.io/pause:3.4.1 diff --git a/hack/testdata/prune/a.yaml b/hack/testdata/prune/a.yaml index badd10caa8b..df47f2a559b 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:2.0 + image: k8s.gcr.io/pause:3.4.1 diff --git a/hack/testdata/prune/b.yaml b/hack/testdata/prune/b.yaml index 46365d28b7a..7bb19d0c9b5 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:2.0 + image: k8s.gcr.io/pause:3.4.1 diff --git a/hack/testdata/sorted-pods/sorted-pod1.yaml b/hack/testdata/sorted-pods/sorted-pod1.yaml index dd27241f95c..2a077a17f44 100644 --- a/hack/testdata/sorted-pods/sorted-pod1.yaml +++ b/hack/testdata/sorted-pods/sorted-pod1.yaml @@ -8,4 +8,4 @@ metadata: spec: containers: - name: kubernetes-pause2 - image: k8s.gcr.io/pause:2.0 + image: k8s.gcr.io/pause:3.4.1 diff --git a/hack/testdata/sorted-pods/sorted-pod2.yaml b/hack/testdata/sorted-pods/sorted-pod2.yaml index 9a811099e6a..a046cde9674 100644 --- a/hack/testdata/sorted-pods/sorted-pod2.yaml +++ b/hack/testdata/sorted-pods/sorted-pod2.yaml @@ -8,4 +8,4 @@ metadata: spec: containers: - name: kubernetes-pause1 - image: k8s.gcr.io/pause:2.0 + image: k8s.gcr.io/pause:3.4.1 diff --git a/hack/testdata/sorted-pods/sorted-pod3.yaml b/hack/testdata/sorted-pods/sorted-pod3.yaml index dd209a5f656..45b599b06a0 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:2.0 + image: k8s.gcr.io/pause:3.4.1 diff --git a/pkg/kubelet/dockershim/docker_sandbox.go b/pkg/kubelet/dockershim/docker_sandbox.go index 8408a2ccce3..5d4f97ddbb6 100644 --- a/pkg/kubelet/dockershim/docker_sandbox.go +++ b/pkg/kubelet/dockershim/docker_sandbox.go @@ -40,7 +40,7 @@ import ( ) const ( - defaultSandboxImage = "k8s.gcr.io/pause:3.2" + defaultSandboxImage = "k8s.gcr.io/pause:3.4.1" // 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 57b004e720d..b308ff07a49 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.2 + image: k8s.gcr.io/pause:3.4.1 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.2 + image: k8s.gcr.io/pause:3.4.1 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 e4541b8bc35..c01b0bcd928 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.2 + image: k8s.gcr.io/pause:3.4.1 diff --git a/test/cmd/core.sh b/test/cmd/core.sh index 910ba4a6884..96aff1489c1 100755 --- a/test/cmd/core.sh +++ b/test/cmd/core.sh @@ -529,9 +529,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.2"}]}}' + 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.4.1"}]}}' # Post-condition: valid-pod POD has expected image - kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.2:' + kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.4.1:' # 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/cmd/diff.sh b/test/cmd/diff.sh index 4894e62b1c8..c1e75d683fe 100755 --- a/test/cmd/diff.sh +++ b/test/cmd/diff.sh @@ -47,7 +47,7 @@ run_kubectl_diff_tests() { # 1. the exit code for diff is 1 because it found a difference # 2. the difference contains the changed image output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml || test $? -eq 1) - kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.0' + kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4' # Ensure diff only dry-runs and doesn't persist change resourceVersion=$(kubectl get "${kube_flags[@]:?}" -f hack/testdata/pod.yaml -o go-template='{{ .metadata.resourceVersion }}') @@ -55,7 +55,7 @@ run_kubectl_diff_tests() { # Test found diff with server-side apply output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml --server-side || test $? -eq 1) - kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.0' + kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4' # Ensure diff --server-side only dry-runs and doesn't persist change resourceVersion=$(kubectl get "${kube_flags[@]:?}" -f hack/testdata/pod.yaml -o go-template='{{ .metadata.resourceVersion }}') @@ -86,7 +86,7 @@ run_kubectl_diff_tests() { # 1. the exit code for diff is 1 because it found a difference # 2. the difference contains the changed image output_message=$(kubectl diff --server-side -f hack/testdata/pod-changed.yaml || test $? -eq 1) - kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.0' + kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4' # Cleanup kubectl delete -f hack/testdata/pod.yaml diff --git a/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml b/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml index 53ad25f5dee..e74440c2aae 100644 --- a/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml +++ b/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml @@ -76,5 +76,6 @@ spec: - name: root-mount mountPath: /root containers: - - image: "k8s.gcr.io/pause:3.2" - name: pause \ No newline at end of file + - image: "k8s.gcr.io/pause:3.4.1" + 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 57b004e720d..b308ff07a49 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.2 + image: k8s.gcr.io/pause:3.4.1 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:3.2 + image: k8s.gcr.io/pause:3.4.1 diff --git a/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml b/test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml index e4541b8bc35..c01b0bcd928 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.2 + image: k8s.gcr.io/pause:3.4.1 diff --git a/test/integration/benchmark-controller.json b/test/integration/benchmark-controller.json index c0c1a901d0c..48b2e573f24 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.2" + "image": "k8s.gcr.io/pause:3.4.1" }] } } diff --git a/test/integration/scheduler_perf/config/pod-default.yaml b/test/integration/scheduler_perf/config/pod-default.yaml index 5ab07291f85..d1ad33bd507 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.2 + - image: k8s.gcr.io/pause:3.4.1 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 2f15785af64..868035bc8ed 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.2 + - image: k8s.gcr.io/pause:3.4.1 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 72ffeb62bfc..e9fce799706 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.2 + - image: k8s.gcr.io/pause:3.4.1 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 709d0e780ce..30c7e10cefa 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.2 + - image: k8s.gcr.io/pause:3.4.1 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 352f7e91124..f52af087ab6 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.2 + - image: k8s.gcr.io/pause:3.4.1 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 f523a1d8036..032b7d2f658 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.2 + - image: k8s.gcr.io/pause:3.4.1 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 a6291875ce2..98f4336605f 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.2 + - image: k8s.gcr.io/pause:3.4.1 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 13e80d32ac2..9c94d1acefa 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.2 + - image: k8s.gcr.io/pause:3.4.1 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 3df57a06f5e..1e8097d1c55 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.2 + - image: k8s.gcr.io/pause:3.4.1 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 5fbc23e2697..48c859f326e 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.2 + - image: k8s.gcr.io/pause:3.4.1 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 e519f1f46dd..d807fc7d5e1 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.2 + - image: k8s.gcr.io/pause:3.4.1 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 8175b555521..0c7c16f2ae7 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.2 + - image: k8s.gcr.io/pause:3.4.1 name: pause ports: - containerPort: 80 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index d1d31051c4a..5cba0b5d3e6 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -248,7 +248,7 @@ func initImageConfigs() (map[int]Config, map[int]Config) { configs[Nonewprivs] = Config{promoterE2eRegistry, "nonewprivs", "1.3"} configs[NonRoot] = Config{promoterE2eRegistry, "nonroot", "1.1"} // Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go - configs[Pause] = Config{gcRegistry, "pause", "3.2"} + configs[Pause] = Config{gcRegistry, "pause", "3.4.1"} configs[Perl] = Config{dockerLibraryRegistry, "perl", "5.26"} configs[PrometheusDummyExporter] = Config{gcRegistry, "prometheus-dummy-exporter", "v0.1.0"} configs[PrometheusToSd] = Config{gcRegistry, "prometheus-to-sd", "v0.5.0"} diff --git a/test/utils/runners.go b/test/utils/runners.go index fe4ff16691d..a1f76b3f965 100644 --- a/test/utils/runners.go +++ b/test/utils/runners.go @@ -1303,7 +1303,7 @@ func MakePodSpec() v1.PodSpec { return v1.PodSpec{ Containers: []v1.Container{{ Name: "pause", - Image: "k8s.gcr.io/pause:3.2", + Image: "k8s.gcr.io/pause:3.4.1", Ports: []v1.ContainerPort{{ContainerPort: 80}}, Resources: v1.ResourceRequirements{ Limits: v1.ResourceList{ @@ -1725,7 +1725,7 @@ type DaemonConfig struct { func (config *DaemonConfig) Run() error { if config.Image == "" { - config.Image = "k8s.gcr.io/pause:3.2" + config.Image = "k8s.gcr.io/pause:3.4.1" } nameLabel := map[string]string{ "name": config.Name + "-daemon",