Bump CAPZ to v1.33.x

Signed-off-by: Alexandr Demicev <[email protected]>

Author: alexander-demicev

.github/workflows/run-vsphere-tests.yaml

@@ -12,7 +12,6 @@ env:
   VSPHERE_DATACENTER: ${{ secrets.VSPHERE_DATACENTER }}
   VSPHERE_DATASTORE: ${{ secrets.VSPHERE_DATASTORE }}
   VSPHERE_FOLDER: ${{ secrets.VSPHERE_FOLDER }}
-  VSPHERE_TEMPLATE: ${{ secrets.VSPHERE_TEMPLATE }}
   VSPHERE_NETWORK: ${{ secrets.VSPHERE_NETWORK }}
   VSPHERE_RESOURCE_POOL: ${{ secrets.VSPHERE_RESOURCE_POOL }}
   VSPHERE_USERNAME: ${{ secrets.VSPHERE_USERNAME }}

examples/clusterclasses/azure/kubeadm/clusterclass-kubeadm-example.yaml

@@ -265,12 +265,10 @@ spec:
       kubeadmConfigSpec:
         clusterConfiguration:
           apiServer:
-            extraArgs: {}
             timeoutForControlPlane: 20m
           controllerManager:
             extraArgs:
               allocate-node-cidrs: "false"
-              cloud-provider: external
               cluster-name: "TO_BE_REPLACED_BY_PATCH"
           etcd:
             local:

test/e2e/config/operator.yaml

@@ -50,6 +50,7 @@ variables:
   # For example: https://portal.azure.com/#view/Microsoft_Azure_ComputeHub/ComputeHubMenuBlade/~/communityImagesBrowse
   #              Filter `capi-ubun2-2404` images. Beware: not all versions are published on all regions.
   AZURE_KUBERNETES_VERSION: "v1.33.5"
+  AZURE_AKS_KUBERNETES_VERSION: "v1.33.3"
 
   # AWS Configuration
   #
@@ -68,6 +69,9 @@ variables:
 
   # GCP Configuration
   GCP_MACHINE_TYPE: "n1-standard-2"
+
+  # vSphere Configuration
+  VSPHERE_TEMPLATE: "turtles-ci/ubuntu-2404-kube-v1.33.5"
 
   # CLI Tool Paths
   CLUSTERCTL_BINARY_PATH: ""

test/e2e/const.go

@@ -159,10 +159,11 @@ const (
 
 	BootstrapClusterNameVar = "BOOTSTRAP_CLUSTER_NAME"
 
-	KubernetesVersionVar      = "KUBERNETES_VERSION"
-	AWSKubernetesVersionVar   = "AWS_KUBERNETES_VERSION"
-	AzureKubernetesVersionVar = "AZURE_KUBERNETES_VERSION"
-	RancherHostnameVar        = "RANCHER_HOSTNAME"
+	KubernetesVersionVar         = "KUBERNETES_VERSION"
+	AWSKubernetesVersionVar      = "AWS_KUBERNETES_VERSION"
+	AzureKubernetesVersionVar    = "AZURE_KUBERNETES_VERSION"
+	AzureAKSKubernetesVersionVar = "AZURE_AKS_KUBERNETES_VERSION"
+	RancherHostnameVar           = "RANCHER_HOSTNAME"
 
 	ArtifactsFolderVar     = "ARTIFACTS_FOLDER"
 	UseExistingClusterVar  = "USE_EXISTING_CLUSTER"

test/e2e/suites/import-gitops/import_gitops_test.go

@@ -144,6 +144,9 @@ var _ = Describe("[Azure] [AKS] Create and delete CAPI cluster from cluster clas
 			CapiClusterOwnerNamespaceLabel: e2e.CapiClusterOwnerNamespaceLabel,
 			OwnedLabelName:                 e2e.OwnedLabelName,
 			TopologyNamespace:              topologyNamespace,
+			AdditionalTemplateVariables: map[string]string{
+				e2e.KubernetesVersionVar: e2e.LoadE2EConfig().GetVariableOrEmpty(e2e.AzureAKSKubernetesVersionVar), // override the default k8s version
+			},
 			AdditionalFleetGitRepos: []turtlesframework.FleetCreateGitRepoInput{
 				{
 					Name:            "azure-cluster-classes-aks",