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/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.6"}]}}'
+  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.7"}]}}'
  # Post-condition: valid-pod POD has expected image
-  kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.6:'
+  kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.7:'

  # 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
@@ -81,6 +81,6 @@ spec:
        - name: root-mount
          mountPath: /root
      containers:
-      - image: "k8s.gcr.io/pause:3.6"
+      - image: "k8s.gcr.io/pause:3.7"
        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.6
+        image: k8s.gcr.io/pause:3.7
 ---
 apiVersion: v1
 kind: ReplicationController
@@ -30,4 +30,4 @@ spec:
    spec:
      containers:
      - name: mock-container
-        image: k8s.gcr.io/pause:3.6
+        image: k8s.gcr.io/pause:3.7
--- 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.6
+        image: k8s.gcr.io/pause:3.7
--- 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
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -260,7 +260,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.2"}
 	// Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go
-	configs[Pause] = Config{list.GcRegistry, "pause", "3.6"}
+	configs[Pause] = Config{list.GcRegistry, "pause", "3.7"}
 	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"}
--- 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.6",
+			Image: "k8s.gcr.io/pause:3.7",
 			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.6"
+		config.Image = "k8s.gcr.io/pause:3.7"
 	}
 	nameLabel := map[string]string{
 		"name": config.Name + "-daemon",