kubernetes · k8s-ci-robot · Sep 14, 2021 · Aug 29, 2021
diff --git a/build/dependencies.yaml b/build/dependencies.yaml
@@ -154,7 +154,7 @@ dependencies:
       match: TAG\s*\?=
 
   - name: "k8s.gcr.io/pause: dependents"
-    version: 3.5
+    version: 3.6
     refPaths:
     - path: cmd/kubeadm/app/constants/constants.go
       match: PauseVersion\s+=

diff --git a/build/pause/CHANGELOG.md b/build/pause/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 3.6
+
+* Support for Windows container images (OS Versions: 2022) was added. ([#104438](https://github.com/kubernetes/kubernetes/pull/104438), [@nick5616](https://github.com/nick5616))
+
 # 3.5
 
 * Run the container image as non root user per default ([#97963](https://github.com/kubernetes/kubernetes/pull/97963))

diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh
@@ -160,7 +160,7 @@ export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfi
 # Path for kube-proxy kubeconfig file on Windows nodes.
 export WINDOWS_NODEPROBLEMDETECTOR_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\node-problem-detector.kubeconfig"
 # Pause container image for Windows container.
-export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.5"
+export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.6"
 # Storage Path for csi-proxy. csi-proxy only needs to be installed for Windows.
 export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy"
 # Version for csi-proxy

diff --git a/cluster/gce/windows/smoke-test.sh b/cluster/gce/windows/smoke-test.sh
@@ -358,7 +358,7 @@ spec:
     spec:
       containers:
       - name: pause-win
-        image: k8s.gcr.io/pause:3.5
+        image: k8s.gcr.io/pause:3.6
       nodeSelector:
         kubernetes.io/os: windows
       tolerations:

diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go
@@ -399,7 +399,7 @@ const (
 	ModeNode string = "Node"
 
 	// PauseVersion indicates the default pause image version for kubeadm
-	PauseVersion = "3.5"
+	PauseVersion = "3.6"
 
 	// CgroupDriverSystemd holds the systemd driver type
 	CgroupDriverSystemd = "systemd"

diff --git a/cmd/kubeadm/app/phases/kubelet/flags_test.go b/cmd/kubeadm/app/phases/kubelet/flags_test.go
@@ -120,11 +120,11 @@ func TestBuildKubeletArgMap(t *testing.T) {
 				nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{
 					CRISocket: "/var/run/dockershim.sock",
 				},
-				pauseImage: "gcr.io/pause:3.5",
+				pauseImage: "k8s.gcr.io/pause:3.6",
 			},
 			expected: map[string]string{
 				"network-plugin":            "cni",
-				"pod-infra-container-image": "gcr.io/pause:3.5",
+				"pod-infra-container-image": "k8s.gcr.io/pause:3.6",
 			},
 		},
 	}

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.5"
-	validTmplOut = "image: k8s.gcr.io/pause:3.5"
-	doNothing    = "image: k8s.gcr.io/pause:3.5"
+	validTmpl    = "image: {{ .ImageRepository }}/pause:3.6"
+	validTmplOut = "image: k8s.gcr.io/pause:3.6"
+	doNothing    = "image: k8s.gcr.io/pause:3.6"
 	invalidTmpl1 = "{{ .baz }/d}"
 	invalidTmpl2 = "{{ !foobar }}"
 )

diff --git a/cmd/kubelet/app/options/container_runtime.go b/cmd/kubelet/app/options/container_runtime.go
@@ -28,7 +28,7 @@ import (
 const (
 	// When these values are updated, also update test/utils/image/manifest.go
 	defaultPodSandboxImageName    = "k8s.gcr.io/pause"
-	defaultPodSandboxImageVersion = "3.5"
+	defaultPodSandboxImageVersion = "3.6"
 )
 
 var (

diff --git a/hack/testdata/filter/pod-apply-selector.yaml b/hack/testdata/filter/pod-apply-selector.yaml
@@ -8,4 +8,4 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
diff --git a/hack/testdata/filter/pod-dont-apply.yaml b/hack/testdata/filter/pod-dont-apply.yaml
@@ -8,4 +8,4 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
diff --git a/hack/testdata/multi-resource-1.yaml b/hack/testdata/multi-resource-1.yaml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
 ---
 apiVersion: v1
 kind: Namespace

diff --git a/hack/testdata/multi-resource-3.yaml b/hack/testdata/multi-resource-3.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
 ---
 apiVersion: v1
 kind: Pod
@@ -17,7 +17,7 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
 ---
 apiVersion: v1
 kind: Pod
@@ -26,5 +26,5 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
 
diff --git a/hack/testdata/multi-resource-json-modify.json b/hack/testdata/multi-resource-json-modify.json
@@ -43,7 +43,7 @@
        "spec":{
          "containers":[{
            "name": "mock-container",
-           "image": "k8s.gcr.io/pause:3.5",
+           "image": "k8s.gcr.io/pause:3.6",
            "ports":[{
              "containerPort":9949,
              "protocol":"TCP"

diff --git a/hack/testdata/multi-resource-json.json b/hack/testdata/multi-resource-json.json
@@ -41,7 +41,7 @@
        "spec":{
          "containers":[{
            "name": "mock-container",
-           "image": "k8s.gcr.io/pause:3.5",
+           "image": "k8s.gcr.io/pause:3.6",
            "ports":[{
              "containerPort":9949,
              "protocol":"TCP"

diff --git a/hack/testdata/multi-resource-list-modify.json b/hack/testdata/multi-resource-list-modify.json
@@ -47,7 +47,7 @@
                "spec":{
                   "containers":[{
                     "name": "mock-container",
-                    "image": "k8s.gcr.io/pause:3.5",
+                    "image": "k8s.gcr.io/pause:3.6",
                     "ports":[{
                         "containerPort":9949,
                         "protocol":"TCP"

diff --git a/hack/testdata/multi-resource-list.json b/hack/testdata/multi-resource-list.json
@@ -45,7 +45,7 @@
                "spec":{
                   "containers":[{
                     "name": "mock-container",
-                    "image": "k8s.gcr.io/pause:3.5",
+                    "image": "k8s.gcr.io/pause:3.6",
                     "ports":[{
                         "containerPort":9949,
                         "protocol":"TCP"

diff --git a/hack/testdata/multi-resource-rclist-modify.json b/hack/testdata/multi-resource-rclist-modify.json
@@ -26,7 +26,7 @@
                "spec":{
                   "containers":[{
                     "name": "mock-container",
-                    "image": "k8s.gcr.io/pause:3.5",
+                    "image": "k8s.gcr.io/pause:3.6",
                     "ports":[{
                         "containerPort":9949,
                         "protocol":"TCP"
@@ -60,7 +60,7 @@
             "spec":{
               "containers":[{
                 "name": "mock-container",
-                "image": "k8s.gcr.io/pause:3.5",
+                "image": "k8s.gcr.io/pause:3.6",
                 "ports":[{
                   "containerPort":9949,
                   "protocol":"TCP"

diff --git a/hack/testdata/multi-resource-rclist.json b/hack/testdata/multi-resource-rclist.json
@@ -26,7 +26,7 @@
                "spec":{
                   "containers":[{
                     "name": "mock-container",
-                    "image": "k8s.gcr.io/pause:3.5",
+                    "image": "k8s.gcr.io/pause:3.6",
                     "ports":[{
                         "containerPort":9949,
                         "protocol":"TCP"
@@ -60,7 +60,7 @@
             "spec":{
               "containers":[{
                 "name": "mock-container",
-                "image": "k8s.gcr.io/pause:3.5",
+                "image": "k8s.gcr.io/pause:3.6",
                 "ports":[{
                   "containerPort":9949,
                   "protocol":"TCP"

diff --git a/hack/testdata/multi-resource-yaml-modify.yaml b/hack/testdata/multi-resource-yaml-modify.yaml
@@ -29,7 +29,7 @@ spec:
     spec:
       containers:
       - name: mock-container
-        image: k8s.gcr.io/pause:3.5
+        image: k8s.gcr.io/pause:3.6
         ports:
         - containerPort: 9949
           protocol: TCP
diff --git a/hack/testdata/multi-resource-yaml.yaml b/hack/testdata/multi-resource-yaml.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       containers:
       - name: mock-container
-        image: k8s.gcr.io/pause:3.5
+        image: k8s.gcr.io/pause:3.6
         ports:
         - containerPort: 9949
           protocol: TCP
diff --git a/hack/testdata/pod-apply.yaml b/hack/testdata/pod-apply.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
diff --git 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.5"
+        "image": "k8s.gcr.io/pause:3.6"
       }
     ],
     "restartPolicy": "Never",
@@ -21,4 +21,4 @@
       ]
     }
   }
-}
+}
diff --git a/hack/testdata/pod.yaml b/hack/testdata/pod.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
diff --git a/hack/testdata/prune/a.yaml b/hack/testdata/prune/a.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
diff --git a/hack/testdata/prune/b.yaml b/hack/testdata/prune/b.yaml
@@ -8,4 +8,4 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
diff --git a/hack/testdata/sorted-pods/sorted-pod1.yaml b/hack/testdata/sorted-pods/sorted-pod1.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause2
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
     resources: 
       requests:
         memory: "64Mi"

diff --git a/hack/testdata/sorted-pods/sorted-pod2.yaml b/hack/testdata/sorted-pods/sorted-pod2.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause1
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
     resources: 
       requests:
         memory: "1G"

diff --git a/hack/testdata/sorted-pods/sorted-pod3.yaml b/hack/testdata/sorted-pods/sorted-pod3.yaml
@@ -8,4 +8,4 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause3
-    image: k8s.gcr.io/pause:3.5
+    image: k8s.gcr.io/pause:3.6
diff --git a/pkg/kubelet/dockershim/docker_sandbox.go b/pkg/kubelet/dockershim/docker_sandbox.go
@@ -41,7 +41,7 @@ import (
 )
 
 const (
-	defaultSandboxImage = "k8s.gcr.io/pause:3.5"
+	defaultSandboxImage = "k8s.gcr.io/pause:3.6"
 
 	// 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.5
+        image: k8s.gcr.io/pause:3.6
 ---
 apiVersion: v1
 kind: ReplicationController
@@ -30,4 +30,4 @@ spec:
     spec:
       containers:
       - name: mock-container
-        image: k8s.gcr.io/pause:3.5
+        image: k8s.gcr.io/pause:3.6
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.5
+        image: k8s.gcr.io/pause:3.6
diff --git 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.5"}]}}'
+  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"}]}}'
   # Post-condition: valid-pod POD has expected image
-  kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.5:'
+  kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.6:'
 
   # 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
@@ -81,6 +81,6 @@ spec:
         - name: root-mount
           mountPath: /root
       containers:
-      - image: "k8s.gcr.io/pause:3.5"
+      - image: "k8s.gcr.io/pause:3.6"
         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
@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
       - name: mock-container
-        image: k8s.gcr.io/pause:3.5
+        image: k8s.gcr.io/pause:3.6
 ---
 apiVersion: v1
 kind: ReplicationController
@@ -30,4 +30,4 @@ spec:
     spec:
       containers:
       - name: mock-container
-        image: k8s.gcr.io/pause:3.5
+        image: k8s.gcr.io/pause:3.6
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.5
+        image: k8s.gcr.io/pause:3.6
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.5"
+             "image": "k8s.gcr.io/pause:3.6"
            }]
        }
     }

diff --git 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.5
+  - image: k8s.gcr.io/pause:3.6
     name: pause
diff --git 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.4.1
+  - image: k8s.gcr.io/pause:3.6
     name: pause
     ports:
     - containerPort: 80

diff --git 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.4.1
+  - image: k8s.gcr.io/pause:3.6
     name: pause
     ports:
     - containerPort: 80

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.5
+  - image: k8s.gcr.io/pause:3.6
     name: pause
     ports:
     - containerPort: 80