Merge pull request #3617 from k8s-infra-cherrypick-robot/cherry-pick-3616-to-release-1.14

[release-1.14] 🌱 Bump Kubernetes to v1.34 and add new OVA's

Author: k8s-ci-robot

Makefile

@@ -44,7 +44,7 @@ export GO111MODULE=on
 #
 # Kubebuilder.
 #
-export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.33.0
+export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.34.0
 export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
 export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
 

internal/test/helpers/vcsim/model.go

@@ -41,6 +41,7 @@ var (
 		"ubuntu-2404-kube-v1.31.0",
 		"ubuntu-2404-kube-v1.32.0",
 		"ubuntu-2404-kube-v1.33.0",
+		"ubuntu-2404-kube-v1.34.0",
 	}
 )
 

test/e2e/config/config-overrides-example.yaml

@@ -13,8 +13,8 @@ variables:
   VSPHERE_DATASTORE: "WorkloadDatastore"
   VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy"
   VSPHERE_NETWORK: "network-1"
-  VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.33.0"
-  FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4152.2.2-kube-v1.33.0"
+  VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.34.0"
+  FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4230.2.2-kube-v1.34.0"
   CONTROL_PLANE_ENDPOINT_IP: "10.0.0.10"
   # Only for clusterctl upgrade tests
   # WORKLOAD_CONTROL_PLANE_ENDPOINT_IP:
@@ -27,7 +27,7 @@ variables:
   VSPHERE2_SERVER: "vcenter2.vmware.com"
   VSPHERE2_TLS_THUMBPRINT: "AA:BB:CC:DD:11:22:33:44:EE:FF"
   VSPHERE2_RESOURCE_POOL: "ResourcePool"
-  VSPHERE2_TEMPLATE: "ubuntu-2404-kube-v1.33.0"
+  VSPHERE2_TEMPLATE: "ubuntu-2404-kube-v1.34.0"
   VSPHERE2_CONTROL_PLANE_ENDPOINT_IP: "10.0.0.11"
   # Also following variables are required but it is recommended to use env variables to avoid disclosure of sensitive data
   # VSPHERE2_USERNAME:

test/e2e/config/vsphere.yaml

@@ -276,11 +276,11 @@ providers:
 
 variables:
   # Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
-  KUBERNETES_VERSION_MANAGEMENT: "v1.34.0-beta.0"
+  KUBERNETES_VERSION_MANAGEMENT: "v1.34.0"
   KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: "ci/latest-1.34"
-  KUBERNETES_VERSION: "v1.34.0-beta.0"
+  KUBERNETES_VERSION: "v1.34.0"
   KUBERNETES_VERSION_UPGRADE_FROM: "v1.33.0"
-  KUBERNETES_VERSION_UPGRADE_TO: "v1.34.0-beta.0"
+  KUBERNETES_VERSION_UPGRADE_TO: "v1.34.0"
   KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.34"
   CPI_IMAGE_K8S_VERSION: "v1.34.0-rc.0"
   CNI: "./data/cni/calico/calico.yaml"
@@ -307,12 +307,12 @@ variables:
   VSPHERE_MACHINE_CLASS_CPU_CONFORMANCE: "2"
   VSPHERE_MACHINE_CLASS_MEMORY_CONFORMANCE: "2Gi"
   VSPHERE_CONTENT_LIBRARY: "capv"
-  VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0,ubuntu-2404-kube-v1.31.0,ubuntu-2404-kube-v1.32.0,ubuntu-2404-kube-v1.33.0"
-  VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.33.0"
+  VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0,ubuntu-2404-kube-v1.31.0,ubuntu-2404-kube-v1.32.0,ubuntu-2404-kube-v1.33.0,ubuntu-2404-kube-v1.34.0"
+  VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.34.0"
   VSPHERE_NETWORK: "k8s-ci"
   VSPHERE_DISTRIBUTED_PORT_GROUP: "/Datacenter/network/k8s-ci"
-  VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.33.0"
-  FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4152.2.2-kube-v1.33.0"
+  VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.34.0"
+  FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4230.2.2-kube-v1.34.0"
   KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
   NODE_DRAIN_TIMEOUT_SECONDS: "60"
   EXP_CLUSTER_RESOURCE_SET: "true"

test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml

@@ -19,8 +19,10 @@
             ubuntu-2404-kube-v1.31.0
             {{- else  if eq .builtin.controlPlane.version "v1.32.0" -}}
             ubuntu-2404-kube-v1.32.0
-            {{- else -}}
+            {{- else  if eq .builtin.controlPlane.version "v1.33.0" -}}
             ubuntu-2404-kube-v1.33.0
+            {{- else -}}
+            ubuntu-2404-kube-v1.34.0
             {{- end -}}
       selector:
         apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -44,8 +46,10 @@
             ubuntu-2404-kube-v1.31.0
             {{- else  if eq .builtin.controlPlane.version "v1.32.0" -}}
             ubuntu-2404-kube-v1.32.0
-            {{- else -}}
+            {{- else  if eq .builtin.controlPlane.version "v1.33.0" -}}
             ubuntu-2404-kube-v1.33.0
+            {{- else -}}
+            ubuntu-2404-kube-v1.34.0
             {{- end -}}
       selector:
         apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml

@@ -19,8 +19,10 @@
             ubuntu-2404-kube-v1.31.0
             {{- else  if eq .builtin.controlPlane.version "v1.32.0" -}}
             ubuntu-2404-kube-v1.32.0
-            {{- else -}}
+            {{- else  if eq .builtin.controlPlane.version "v1.33.0" -}}
             ubuntu-2404-kube-v1.33.0
+            {{- else -}}
+            ubuntu-2404-kube-v1.34.0
             {{- end -}}
       selector:
         apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1
@@ -44,8 +46,10 @@
             ubuntu-2404-kube-v1.31.0
             {{- else  if eq .builtin.controlPlane.version "v1.32.0" -}}
             ubuntu-2404-kube-v1.32.0
-            {{- else -}}
+            {{- else  if eq .builtin.controlPlane.version "v1.33.0" -}}
             ubuntu-2404-kube-v1.33.0
+            {{- else -}}
+            ubuntu-2404-kube-v1.34.0
             {{- end -}}
       selector:
         apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1