Merge pull request kubernetes#88173 from BenTheElder/gives-a-whole-new-pause

k8s-ci-robot · web-flow · commit 1c60045db0bd · 2020-02-15T02:11:27.000-08:00
upgrade pause everywhere
diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go
@@ -266,7 +266,7 @@ const (
 	DefaultEtcdVersion = "3.4.3-0"
 
 	// PauseVersion indicates the default pause image version for kubeadm
-	PauseVersion = "3.1"
+	PauseVersion = "3.2"
 
 	// Etcd defines variable used internally when referring to etcd component
 	Etcd = "etcd"
diff --git a/cmd/kubeadm/app/phases/kubelet/flags_test.go b/cmd/kubeadm/app/phases/kubelet/flags_test.go
@@ -245,14 +245,14 @@ func TestBuildKubeletArgMap(t *testing.T) {
 				nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{
 					CRISocket: "/var/run/dockershim.sock",
 				},
-				pauseImage:          "gcr.io/pause:3.1",
+				pauseImage:          "gcr.io/pause:3.2",
 				execer:              cgroupfsCgroupExecer,
 				isServiceActiveFunc: serviceIsNotActiveFunc,
 			},
 			expected: map[string]string{
 				"network-plugin":            "cni",
 				"cgroup-driver":             "cgroupfs",
-				"pod-infra-container-image": "gcr.io/pause:3.1",
+				"pod-infra-container-image": "gcr.io/pause:3.2",
 			},
 		},
 	}
diff --git 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.1"
-	validTmplOut = "image: k8s.gcr.io/pause:3.1"
-	doNothing    = "image: k8s.gcr.io/pause:3.1"
+	validTmpl    = "image: {{ .ImageRepository }}/pause:3.2"
+	validTmplOut = "image: k8s.gcr.io/pause:3.2"
+	doNothing    = "image: k8s.gcr.io/pause:3.2"
 	invalidTmpl1 = "{{ .baz }/d}"
 	invalidTmpl2 = "{{ !foobar }}"
 )
diff --git a/cmd/kubelet/app/options/container_runtime.go b/cmd/kubelet/app/options/container_runtime.go
@@ -26,9 +26,9 @@ import (
 )
 
 const (
-	// When these values are updated, also update test/e2e/framework/util.go
+	// When these values are updated, also update test/utils/image/manifest.go
 	defaultPodSandboxImageName    = "k8s.gcr.io/pause"
-	defaultPodSandboxImageVersion = "3.1"
+	defaultPodSandboxImageVersion = "3.2"
 )
 
 var (
diff --git a/hack/testdata/pod-with-precision.json b/hack/testdata/pod-with-precision.json
@@ -1,24 +1,24 @@
 {
-    "apiVersion": "v1",
-    "kind": "Pod",
-    "metadata": {
-        "name": "pod-with-precision"
-    },
-    "spec": {
-      "activeDeadlineSeconds": 2147483647,
-      "containers": [
-        {
-          "name": "kubernetes-pause",
-          "image": "k8s.gcr.io/pause:3.1"
-        }
-      ],
-      "restartPolicy": "Never",
-      "securityContext": {
-          "supplementalGroups": [
-              0,
-              1000030003,
-              2147483647
-          ]
+  "apiVersion": "v1",
+  "kind": "Pod",
+  "metadata": {
+    "name": "pod-with-precision"
+  },
+  "spec": {
+    "activeDeadlineSeconds": 2147483647,
+    "containers": [
+      {
+        "name": "kubernetes-pause",
+        "image": "k8s.gcr.io/pause:3.2"
       }
+    ],
+    "restartPolicy": "Never",
+    "securityContext": {
+      "supplementalGroups": [
+        0,
+        1000030003,
+        2147483647
+      ]
     }
-}
+  }
+}
diff --git a/pkg/kubelet/dockershim/docker_sandbox.go b/pkg/kubelet/dockershim/docker_sandbox.go
@@ -38,7 +38,7 @@ import (
 )
 
 const (
-	defaultSandboxImage = "k8s.gcr.io/pause:3.1"
+	defaultSandboxImage = "k8s.gcr.io/pause:3.2"
 
 	// 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
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
       - name: mock-container
-        image: k8s.gcr.io/pause:3.1
+        image: k8s.gcr.io/pause:3.2
 ---
 apiVersion: v1
 kind: ReplicationController
@@ -30,4 +30,4 @@ spec:
     spec:
       containers:
       - name: mock-container
-        image: k8s.gcr.io/pause:3.1
+        image: k8s.gcr.io/pause:3.2
diff --git 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.1
+        image: k8s.gcr.io/pause:3.2
diff --git a/test/cmd/core.sh b/test/cmd/core.sh
@@ -517,9 +517,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.1"}]}}'
+  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"}]}}'
   # Post-condition: valid-pod POD has expected image
-  kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.1:'
+  kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.2:'
 
   ## If resourceVersion is specified in the patch, it will be treated as a precondition, i.e., if the resourceVersion is different from that is stored in the server, the Patch should be rejected
   ERROR_FILE="${KUBE_TEMP}/conflict-error"
diff --git 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.1
+        image: k8s.gcr.io/pause:3.2
 ---
 apiVersion: v1
 kind: ReplicationController
@@ -30,4 +30,4 @@ spec:
     spec:
       containers:
       - name: mock-container
-        image: k8s.gcr.io/pause:3.1
+        image: k8s.gcr.io/pause:3.2
diff --git 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.1
+        image: k8s.gcr.io/pause:3.2
diff --git 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.1"
+             "image": "k8s.gcr.io/pause:3.2"
            }]
        }
     }
diff --git 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.1
+  - image: k8s.gcr.io/pause:3.2
     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
@@ -14,7 +14,7 @@ spec:
             - zone1
             - zone2
   containers:
-  - image: k8s.gcr.io/pause:3.1
+  - image: k8s.gcr.io/pause:3.2
     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
@@ -14,7 +14,7 @@ spec:
         topologyKey: failure-domain.beta.kubernetes.io/zone
         namespaces: ["sched-test", "sched-setup"]
   containers:
-  - image: k8s.gcr.io/pause:3.1
+  - image: k8s.gcr.io/pause:3.2
     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
@@ -15,7 +15,7 @@ spec:
         topologyKey: kubernetes.io/hostname
         namespaces: ["sched-test", "sched-setup"]
   containers:
-  - image: k8s.gcr.io/pause:3.1
+  - image: k8s.gcr.io/pause:3.2
     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
@@ -16,7 +16,7 @@ spec:
             namespaces: ["sched-test", "sched-setup"]
           weight: 1
   containers:
-    - image: k8s.gcr.io/pause:3.1
+    - image: k8s.gcr.io/pause:3.2
       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
@@ -16,7 +16,7 @@ spec:
             namespaces: ["sched-test", "sched-setup"]
           weight: 1
   containers:
-    - image: k8s.gcr.io/pause:3.1
+    - image: k8s.gcr.io/pause:3.2
       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
@@ -4,7 +4,7 @@ metadata:
   generateName: secret-volume-
 spec:
   containers:
-  - image: k8s.gcr.io/pause:3.1
+  - image: k8s.gcr.io/pause:3.2
     name: pause
     ports:
     - containerPort: 80
diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
@@ -236,7 +236,7 @@ func initImageConfigs() map[int]Config {
 	configs[Nonewprivs] = Config{e2eRegistry, "nonewprivs", "1.0"}
 	configs[NonRoot] = Config{e2eRegistry, "nonroot", "1.0"}
 	// Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go
-	configs[Pause] = Config{gcRegistry, "pause", "3.1"}
+	configs[Pause] = Config{gcRegistry, "pause", "3.2"}
 	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
@@ -1307,7 +1307,7 @@ func MakePodSpec() v1.PodSpec {
 	return v1.PodSpec{
 		Containers: []v1.Container{{
 			Name:  "pause",
-			Image: "k8s.gcr.io/pause:3.1",
+			Image: "k8s.gcr.io/pause:3.2",
 			Ports: []v1.ContainerPort{{ContainerPort: 80}},
 			Resources: v1.ResourceRequirements{
 				Limits: v1.ResourceList{
@@ -1664,7 +1664,7 @@ type DaemonConfig struct {
 
 func (config *DaemonConfig) Run() error {
 	if config.Image == "" {
-		config.Image = "k8s.gcr.io/pause:3.1"
+		config.Image = "k8s.gcr.io/pause:3.2"
 	}
 	nameLabel := map[string]string{
 		"name": config.Name + "-daemon",

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ import (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`const (`
`24`		`- validTmpl = "image: {{ .ImageRepository }}/pause:3.1"`
`25`		`- validTmplOut = "image: k8s.gcr.io/pause:3.1"`
`26`		`- doNothing = "image: k8s.gcr.io/pause:3.1"`
	`24`	`+ validTmpl = "image: {{ .ImageRepository }}/pause:3.2"`
	`25`	`+ validTmplOut = "image: k8s.gcr.io/pause:3.2"`
	`26`	`+ doNothing = "image: k8s.gcr.io/pause:3.2"`
`27`	`27`	`invalidTmpl1 = "{{ .baz }/d}"`
`28`	`28`	`invalidTmpl2 = "{{ !foobar }}"`
`29`	`29`	`)`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ import (`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`const (`
`29`		`- // When these values are updated, also update test/e2e/framework/util.go`
	`29`	`+ // When these values are updated, also update test/utils/image/manifest.go`
`30`	`30`	`defaultPodSandboxImageName = "k8s.gcr.io/pause"`
`31`		`- defaultPodSandboxImageVersion = "3.1"`
	`31`	`+ defaultPodSandboxImageVersion = "3.2"`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ import (`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`const (`
`41`		`- defaultSandboxImage = "k8s.gcr.io/pause:3.1"`
	`41`	`+ defaultSandboxImage = "k8s.gcr.io/pause:3.2"`
`42`	`42`
`43`	`43`	`// Various default sandbox resources requests/limits.`
`44`	`44`	`defaultSandboxCPUshares int64 = 2`