Merge pull request #1844 from rancher/v0-24_bump_k8s_v1-33

[release-v0.24] Bump to v1.33

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 }}

charts/rancher-turtles/Chart.yaml

@@ -14,7 +14,7 @@ keywords:
 annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/display-name: Rancher Turtles - the Cluster API Extension
-  catalog.cattle.io/kube-version: '>= 1.31.4-0 < 1.32.0-0'
+  catalog.cattle.io/kube-version: '>= 1.31.4-0 < 1.34.0-0'
   catalog.cattle.io/namespace: rancher-turtles-system
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux

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

@@ -208,13 +208,6 @@ spec:
   template:
     spec:
       kubeadmConfigSpec:
-        clusterConfiguration:
-          apiServer:
-            extraArgs:
-              cloud-provider: external
-          controllerManager:
-            extraArgs:
-              cloud-provider: external
         initConfiguration:
           nodeRegistration:
             kubeletExtraArgs:

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:

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

@@ -194,11 +194,8 @@ spec:
         clusterConfiguration:
           apiServer:
             timeoutForControlPlane: 20m
-            extraArgs:
-              cloud-provider: external
           controllerManager:
             extraArgs:
-              cloud-provider: external
               allocate-node-cidrs: "false"
         initConfiguration:
           nodeRegistration:

test/e2e/config/operator.yaml

@@ -38,34 +38,43 @@ variables:
   SECRET_KEYS: "NGROK_AUTHTOKEN,NGROK_API_KEY,RANCHER_HOSTNAME,RANCHER_PASSWORD,CAPG_ENCODED_CREDS,AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY,AZURE_SUBSCRIPTION_ID,AZURE_CLIENT_ID,AZURE_CLIENT_SECRET,AZURE_TENANT_ID,GCP_PROJECT,GCP_NETWORK_NAME,GCP_IMAGE_ID,VSPHERE_TLS_THUMBPRINT,VSPHERE_SERVER,VSPHERE_DATACENTER,VSPHERE_DATASTORE,VSPHERE_FOLDER,VSPHERE_TEMPLATE,VSPHERE_NETWORK,VSPHERE_RESOURCE_POOL,VSPHERE_USERNAME,VSPHERE_PASSWORD,VSPHERE_KUBE_VIP_IP_KUBEADM,VSPHERE_KUBE_VIP_IP_RKE2,DOCKER_REGISTRY_TOKEN,DOCKER_REGISTRY_USERNAME,DOCKER_REGISTRY_CONFIG"
 
   # Kubernetes Configuration
-  KUBERNETES_VERSION: "v1.31.4"
-  KUBERNETES_MANAGEMENT_VERSION: "v1.31.4"
-  RKE2_VERSION: "v1.31.7+rke2r1"
+  KUBERNETES_VERSION: "v1.33.5"
+  KUBERNETES_MANAGEMENT_VERSION: "v1.32.3"
+  RKE2_VERSION: "v1.33.5+rke2r1"
   RKE2_CNI: "none"
 
   # Azure Configuration
   #
   # Azure Kubeadm tests need specific k8s version.
   # This is due to the limited availability of published AMIs.
-  # For example: https://portal.azure.com/#@suseazuredev.onmicrosoft.com/resource/providers/Microsoft.Compute/locations/FranceCentral/CommunityGalleries/ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019/Images/capi-ubun2-2204/overview
-  AZURE_KUBERNETES_VERSION: "v1.31.1"
+  # 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
   #
   # AWS Kubeadm tests need specific k8s version.
   # This is due to the limited availability of published AMIs.
   # For a complete list, run: clusterawsadm ami list
-  AWS_KUBERNETES_VERSION: "v1.31.0"
+  # Alternatively, seach for `capa-ami` in https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#AMICatalog:
+  AWS_KUBERNETES_VERSION: "v1.33.5"
   AWS_REGION: "eu-west-2"
   KUBERNETES_MANAGEMENT_AWS_REGION: "eu-west-2"
   AWS_CONTROL_PLANE_MACHINE_TYPE: "t3.large"
   AWS_NODE_MACHINE_TYPE: "t3.large"
   AWS_RKE2_CONTROL_PLANE_MACHINE_TYPE: "t3.xlarge"
   AWS_RKE2_NODE_MACHINE_TYPE: "t3.xlarge"
-  AWS_AMI_ID: "ami-012e88f0aa221423a" # Public upstream AMI
+  AWS_AMI_ID: "ami-0cd9e4e7906f4c9dd" # Private AMI present only in eu-west-2
 
   # GCP Configuration
   GCP_MACHINE_TYPE: "n1-standard-2"
+
+  # vSphere Configuration
+  VSPHERE_TEMPLATE: "turtles-ci/ubuntu-2404-kube-v1.33.5"
+
+  # Docker Configuration
+  DOCKER_KUBERNETES_VERSION: "v1.33.4"
 
   # CLI Tool Paths
   CLUSTERCTL_BINARY_PATH: ""
@@ -97,7 +106,6 @@ variables:
   CERT_MANAGER_REPO_NAME: "jetstack"
   CERT_MANAGER_URL: "https://charts.jetstack.io"
   CERT_MANAGER_PATH: "jetstack/cert-manager"
-  CPI_IMAGE_K8S_VERSION: "v1.31.0"
 
   # Ingress Configuration (Ngrok)
   NGROK_REPO_NAME: "ngrok"

test/e2e/const.go

@@ -159,10 +159,12 @@ 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"
+	DockerKubernetesVersionVar   = "DOCKER_KUBERNETES_VERSION"
+	RancherHostnameVar           = "RANCHER_HOSTNAME"
 
 	ArtifactsFolderVar     = "ARTIFACTS_FOLDER"
 	UseExistingClusterVar  = "USE_EXISTING_CLUSTER"

test/e2e/data/cluster-templates/aws-eks-mmp.yaml

@@ -74,4 +74,5 @@ metadata:
   namespace: "${NAMESPACE}"
   annotations:
     "helm.sh/resource-policy": keep
-spec: {}
+spec:
+  amiType: AL2023_x86_64_STANDARD

test/e2e/data/cluster-templates/aws-kubeadm-topology.yaml

@@ -34,6 +34,8 @@ spec:
       value: ${AWS_CONTROL_PLANE_MACHINE_TYPE}
     - name: workerMachineType
       value: ${AWS_NODE_MACHINE_TYPE}
+    - name: amiID
+      value: ${AWS_AMI_ID}
     - name: awsClusterIdentityName
       value: cluster-identity
     version: ${AWS_KUBERNETES_VERSION}

test/e2e/suites/chart-upgrade/chart_upgrade_test.go

@@ -114,6 +114,9 @@ var _ = Describe("Chart upgrade functionality should work", Ordered, Label(e2e.S
 				TopologyNamespace:              topologyNamespace,
 				SkipCleanup:                    true,
 				SkipDeletionTest:               true,
+				AdditionalTemplateVariables: map[string]string{
+					e2e.KubernetesVersionVar: e2e.LoadE2EConfig().GetVariableOrEmpty(e2e.DockerKubernetesVersionVar), // override the default k8s version
+				},
 				AdditionalFleetGitRepos: []framework.FleetCreateGitRepoInput{
 					{
 						Name:            "docker-cluster-classes-regular",