Merge pull request #3487 from marosset/1d6c199-on-release-1-8

[release-1.8] Cherry-picking 1d6c199 into release-1.8

Author: k8s-ci-robot

docs/book/src/topics/windows.md

@@ -81,9 +81,9 @@ The Windows HostProcess Container feature is Alpha for Kubernetes v1.22 and Beta
 
 Current requirements:
 
-- Kubernetes 1.22+
+- Kubernetes 1.23+
 - containerd 1.6+
-- `WindowsHostProcessContainers` feature-gate (Alpha for v1.22) turned on for kube-apiserver and kubelet if using Kubernetes 1.22
+- `WindowsHostProcessContainers` feature-gate (Beta / on-by-default for v1.23) turned on for kube-apiserver and kubelet
 
 These requirements are satisfied by the Windows Containerd Template and Azure Marketplace reference image `cncf-upstream:capi-windows:k8s-1dot22dot1-windows-2019-containerd:2021.10.15`
 

scripts/ci-entrypoint.sh

@@ -102,13 +102,7 @@ setup() {
     export CCM_COUNT="${CCM_COUNT:-1}"
     export WORKER_MACHINE_COUNT="${WORKER_MACHINE_COUNT:-2}"
     export EXP_CLUSTER_RESOURCE_SET="true"
-    # this requires k8s 1.22+
-    if [[ -n "${K8S_FEATURE_GATES:-}" ]]; then
-        export K8S_FEATURE_GATES="${K8S_FEATURE_GATES:-},WindowsHostProcessContainers=true"
-    else
-        export K8S_FEATURE_GATES="WindowsHostProcessContainers=true"
-    fi
-
+    
     # TODO figure out a better way to account for expected Windows node count
     if [[ -n "${TEST_WINDOWS:-}" ]]; then
         export WINDOWS_WORKER_MACHINE_COUNT="${WINDOWS_WORKER_MACHINE_COUNT:-2}"

templates/cluster-template-machinepool-windows.yaml

@@ -4,5 +4,4 @@ resources:
   - machine-pool-deployment-windows.yaml
 
 patchesStrategicMerge:
-  - ../base-windows-containerd/kubeadm-control-plane.yaml
   - ../base-windows-containerd/cluster.yaml

templates/cluster-template-windows.yaml

@@ -61,7 +61,6 @@ spec:
         azure-container-registry-config: 'c:/k/azure.json'
         cloud-provider: external
         pod-infra-container-image: "mcr.microsoft.com/oss/kubernetes/pause:3.9"
-        feature-gates: "WindowsHostProcessContainers=true"
   files:
   - contentFrom:
       secret:

templates/flavors/base-windows-containerd/kubeadm-control-plane.yaml

@@ -4,6 +4,5 @@ resources:
   - machine-deployment-windows.yaml
 
 patchesStrategicMerge:
-  - ../base-windows-containerd/kubeadm-control-plane.yaml
   - ../base-windows-containerd/cluster.yaml
 

templates/flavors/machinepool-windows/kustomization.yaml

@@ -65,7 +65,6 @@ spec:
           kubeletExtraArgs:
             azure-container-registry-config: 'c:/k/azure.json'
             cloud-provider: external
-            feature-gates: "WindowsHostProcessContainers=true"
             v: "2"
             windows-priorityclass: "ABOVE_NORMAL_PRIORITY_CLASS"
       files: