Bump CAPA to v1.33.x

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

Author: alexander-demicev

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:

test/e2e/config/operator.yaml

@@ -39,7 +39,7 @@ variables:
 
   # Kubernetes Configuration
   KUBERNETES_VERSION: "v1.33.5"
-  KUBERNETES_MANAGEMENT_VERSION: "v1.33.4"
+  KUBERNETES_MANAGEMENT_VERSION: "v1.32.3"
   RKE2_VERSION: "v1.33.5+rke2r1"
   RKE2_CNI: "none"
 
@@ -57,14 +57,14 @@ variables:
   # This is due to the limited availability of published AMIs.
   # For a complete list, run: clusterawsadm ami list
   # 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.32.6"
+  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-0e0464240725c0f6b" # Public upstream AMI
+  AWS_AMI_ID: "ami-0cd9e4e7906f4c9dd" # Private AMI present only in eu-west-2
 
   # GCP Configuration
   GCP_MACHINE_TYPE: "n1-standard-2"

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}