Merge pull request kubernetes#125112 from neolit123/1.31-add-v-to-windows-pause-after-promo

dependencies: start using registry.k8s.io/pause:3.10

Author: k8s-ci-robot

build/dependencies.yaml

@@ -189,17 +189,14 @@ dependencies:
     - path: build/common.sh
       match: __default_go_runner_version=
 
-  # TODO: enable once pause 3.10 is promoted
-  # https://github.com/kubernetes/kubernetes/issues/125092
-  #
-  # - name: "registry.k8s.io/pause"
-  #   version: 3.10
-  #   refPaths:
-  #   - path: build/pause/Makefile
-  #     match: TAG\s*\?=
+  - name: "registry.k8s.io/pause"
+    version: 3.10
+    refPaths:
+    - path: build/pause/Makefile
+      match: TAG\s*\?=
 
   - name: "registry.k8s.io/pause: dependents"
-    version: 3.9
+    version: 3.10
     refPaths:
     - path: cluster/gce/config-common.sh
       match: registry.k8s.io\/pause:\d+\.\d+
@@ -209,12 +206,6 @@ dependencies:
       match: registry.k8s.io\/pause:\d+\.\d+
     - path: cmd/kubeadm/app/constants/constants.go
       match: PauseVersion\s+=
-    - path: cmd/kubeadm/app/util/template_test.go
-      match: validTmpl\s+=
-    - path: cmd/kubeadm/app/util/template_test.go
-      match: validTmplOut\s+=
-    - path: cmd/kubeadm/app/util/template_test.go
-      match: doNothing\s+=
     - path: cmd/kubelet/app/options/container_runtime.go
       match: defaultPodSandboxImageVersion\s+=
     - path: hack/testdata/pod-with-precision.json
@@ -249,8 +240,6 @@ dependencies:
       match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml
       match: registry.k8s.io\/pause:\d+\.\d+
-    - path: test/utils/runners.go
-      match: registry.k8s.io\/pause:\d+\.\d+
     - path: test/utils/image/manifest.go
       match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
 

cluster/gce/config-common.sh

@@ -154,7 +154,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="registry.k8s.io/pause:3.9"
+export WINDOWS_INFRA_CONTAINER="registry.k8s.io/pause:3.10"
 # 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

cluster/gce/gci/configure-helper.sh

@@ -3279,7 +3279,7 @@ oom_score = -999
 [plugins."io.containerd.grpc.v1.cri"]
   stream_server_address = "127.0.0.1"
   max_container_log_line_size = ${CONTAINERD_MAX_CONTAINER_LOG_LINE:-262144}
-  sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.9"}"
+  sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.10"}"
 [plugins."io.containerd.grpc.v1.cri".cni]
   bin_dir = "${KUBE_HOME}/bin"
   conf_dir = "/etc/cni/net.d"

cluster/gce/windows/smoke-test.sh

@@ -341,7 +341,7 @@ spec:
     spec:
       containers:
       - name: pause-win
-        image: registry.k8s.io/pause:3.9
+        image: registry.k8s.io/pause:3.10
       nodeSelector:
         kubernetes.io/os: windows
       tolerations:

cmd/kubeadm/app/constants/constants.go

@@ -435,7 +435,7 @@ const (
 	ModeNode string = "Node"
 
 	// PauseVersion indicates the default pause image version for kubeadm
-	PauseVersion = "3.9"
+	PauseVersion = "3.10"
 
 	// CgroupDriverSystemd holds the systemd driver type
 	CgroupDriverSystemd = "systemd"

cmd/kubeadm/app/phases/kubelet/flags_test.go

@@ -79,11 +79,11 @@ func TestBuildKubeletArgs(t *testing.T) {
 				nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{
 					CRISocket: "unix:///var/run/containerd/containerd.sock",
 				},
-				pauseImage: "registry.k8s.io/pause:3.9",
+				pauseImage: "registry.k8s.io/pause:ver",
 			},
 			expected: []kubeadmapi.Arg{
 				{Name: "container-runtime-endpoint", Value: "unix:///var/run/containerd/containerd.sock"},
-				{Name: "pod-infra-container-image", Value: "registry.k8s.io/pause:3.9"},
+				{Name: "pod-infra-container-image", Value: "registry.k8s.io/pause:ver"},
 			},
 		},
 	}

cmd/kubeadm/app/util/runtime/runtime_test.go

@@ -164,8 +164,8 @@ func TestListKubeContainers(t *testing.T) {
 func TestSandboxImage(t *testing.T) {
 	fcmd := fakeexec.FakeCmd{
 		CombinedOutputScript: []fakeexec.FakeAction{
-			func() ([]byte, []byte, error) { return []byte("registry.k8s.io/pause:3.9"), nil, nil },
-			func() ([]byte, []byte, error) { return []byte("registry.k8s.io/pause:3.9\n"), nil, nil },
+			func() ([]byte, []byte, error) { return []byte("registry.k8s.io/pause:ver"), nil, nil },
+			func() ([]byte, []byte, error) { return []byte("registry.k8s.io/pause:ver\n"), nil, nil },
 			func() ([]byte, []byte, error) { return nil, nil, nil },
 			func() ([]byte, []byte, error) { return nil, nil, &fakeexec.FakeExitError{Status: 1} },
 		},
@@ -181,8 +181,8 @@ func TestSandboxImage(t *testing.T) {
 		expected string
 		isError  bool
 	}{
-		{"valid: read sandbox image normally", "registry.k8s.io/pause:3.9", false},
-		{"valid: read sandbox image with leading/trailing white spaces", "registry.k8s.io/pause:3.9", false},
+		{"valid: read sandbox image normally", "registry.k8s.io/pause:ver", false},
+		{"valid: read sandbox image with leading/trailing white spaces", "registry.k8s.io/pause:ver", false},
 		{"invalid: read empty sandbox image", "", true},
 		{"invalid: failed to read sandbox image", "", true},
 	}

cmd/kubeadm/app/util/template_test.go

@@ -21,9 +21,9 @@ import (
 )
 
 const (
-	validTmpl    = "image: {{ .ImageRepository }}/pause:3.9"
-	validTmplOut = "image: registry.k8s.io/pause:3.9"
-	doNothing    = "image: registry.k8s.io/pause:3.9"
+	validTmpl    = "image: {{ .ImageRepository }}/pause:ver"
+	validTmplOut = "image: registry.k8s.io/pause:ver"
+	doNothing    = "image: registry.k8s.io/pause:ver"
 	invalidTmpl1 = "{{ .baz }/d}"
 	invalidTmpl2 = "{{ !foobar }}"
 )

cmd/kubelet/app/options/container_runtime.go

@@ -23,7 +23,7 @@ import (
 const (
 	// When these values are updated, also update test/utils/image/manifest.go
 	defaultPodSandboxImageName    = "registry.k8s.io/pause"
-	defaultPodSandboxImageVersion = "3.9"
+	defaultPodSandboxImageVersion = "3.10"
 )
 
 var (

hack/testdata/filter/pod-apply-selector.yaml

@@ -8,4 +8,4 @@ metadata:
 spec:
   containers:
   - name: kubernetes-pause
-    image: registry.k8s.io/pause:3.9
+    image: registry.k8s.io/pause:3.10