update pause to 3.4.1 for tests(e2e)

Signed-off-by: pacoxu <paco.xu@daocloud.io>
2025-07-19 09:52:49 +00:00 · 2021-02-01 11:53:01 +08:00 · 2021-02-01 11:53:01 +08:00 · 0c152cbbbe
commit 0c152cbbbe
parent f4d843682d
22 changed files with 28 additions and 27 deletions
--- 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",
--- 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
--- 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
--- 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)
--- 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
+      - image: "k8s.gcr.io/pause:3.4.1"
+        name: pause
+
--- 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
--- 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
--- 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"
           }]
       }
    }
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"}
--- 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",