Merge pull request #4865 from mboersma/e2e-k8s-versions

Bump e2e test k8s versions

docs/book/src/topics/windows.md

@@ -77,13 +77,13 @@ curl <EXTERNAL-IP>
 
 #### Kube-proxy and CNIs for Containerd
 
-The Windows HostProcess Container feature is Alpha for Kubernetes v1.22 and Beta for v1.23.  See the Windows [Hostprocess KEP](https://github.com/kubernetes/enhancements/tree/master/keps/sig-windows/1981-windows-privileged-container-support) for more details.  Kube-proxy and other CNI's  have been updated to run in HostProcess containers.  The current implementation is using [kube-proxy and Calico CNI built by sig-windows](https://github.com/kubernetes-sigs/sig-windows-tools/pull/161). Sig-windows is working to upstream the kube-proxy, cni implementations, and improve kubeadm support in the next few releases.
+The Windows HostProcess Container feature is Alpha for Kubernetes v1.22 and Beta for v1.23. In v1.28, this feature is on by default and the `WindowsHostProcessContainers` feature gate is no longer recognized. See the Windows [Hostprocess KEP](https://github.com/kubernetes/enhancements/tree/master/keps/sig-windows/1981-windows-privileged-container-support) for more details. Kube-proxy and other CNI's have been updated to run in HostProcess containers. The current implementation is using [kube-proxy and Calico CNI built by sig-windows](https://github.com/kubernetes-sigs/sig-windows-tools/pull/161). Sig-windows is working to upstream the kube-proxy, cni implementations, and improve kubeadm support in the next few releases.
 
 Current requirements:
 
 - Kubernetes 1.23+
 - containerd 1.6+
-- `WindowsHostProcessContainers` feature-gate (Beta / on-by-default for v1.23) turned on for kube-apiserver and kubelet
+- `WindowsHostProcessContainers` feature-gate (Beta / on-by-default for v1.23) turned on for kube-apiserver and kubelet, omitted in v1.28 and later
 
 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`
 

templates/test/ci/prow-edgezone/kustomization.yaml

@@ -10,7 +10,6 @@ resources:
 patches:
 - path: ../patches/tags.yaml
 - path: ../patches/controller-manager.yaml
-- path: ../patches/apiserver.yaml
 - path: ../patches/uami-md-0.yaml
 - path: ../patches/uami-control-plane.yaml
 - path: patches/azurecluster-edgezone.yaml

templates/test/ci/prow-workload-identity/kustomization.yaml

@@ -11,7 +11,6 @@ patches:
 - path: ../patches/azureclusteridentity-azwi.yaml
 - path: ../patches/tags.yaml
 - path: ../patches/controller-manager.yaml
-- path: ../patches/apiserver.yaml
 - path: ../patches/uami-md-0.yaml
 - path: ../patches/uami-control-plane.yaml
 - path: ../patches/cluster-label-calico.yaml

test/e2e/capi_test.go

@@ -219,8 +219,6 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
 
 				// Unset windows specific variables
 				Expect(os.Unsetenv("WINDOWS_WORKER_MACHINE_COUNT")).To(Succeed())
-
-				Expect(os.Setenv("K8S_FEATURE_GATES", "WindowsHostProcessContainers=true")).To(Succeed())
 			})
 
 			Context("upgrade from an old version of v1beta1 to current, and scale workload clusters created in the old version", func() {

test/e2e/config/azure-dev.yaml

@@ -191,14 +191,14 @@ providers:
 variables:
   AKS_KUBERNETES_VERSION: "latest"
   AKS_KUBERNETES_VERSION_UPGRADE_FROM: "latest-1"
-  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-stable-1.27}"
+  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-stable-1.29}"
   FLATCAR_KUBERNETES_VERSION: "${FLATCAR_KUBERNETES_VERSION:-stable-1.26}"
-  KUBERNETES_VERSION_API_UPGRADE_FROM: "v1.26.12"
+  KUBERNETES_VERSION_API_UPGRADE_FROM: "v1.28.10"
   FLATCAR_VERSION: "${FLATCAR_VERSION:-latest}"
   ETCD_VERSION_UPGRADE_TO: "3.5.10-0"
   COREDNS_VERSION_UPGRADE_TO: "v1.11.1"
-  KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-stable-1.28}"
-  KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-stable-1.27}"
+  KUBERNETES_VERSION_UPGRADE_TO: "${KUBERNETES_VERSION_UPGRADE_TO:-stable-1.29}"
+  KUBERNETES_VERSION_UPGRADE_FROM: "${KUBERNETES_VERSION_UPGRADE_FROM:-stable-1.28}"
   CNI: "${PWD}/templates/addons/calico.yaml"
   ADDONS_PATH: "${PWD}/templates/addons"
   REDACT_LOG_SCRIPT: "${PWD}/hack/log/redact.sh"