Merge pull request #109123 from dims/switch-to-pause-3.7

Switch to pause 3.7 for Kubernetes 1.24
2022-03-29 20:37:39 -07:00
parent cbc341575a f7ad09c447
commit e4690b0fbc
55 changed files with 66 additions and 66 deletions
--- 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"
           }]
       }
    }
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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