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/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/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",