test: update k8s versions in cluster templates

Signed-off-by: Carlos Salas <carlos.salas@suse.com>

Author: salasberryfin

test/e2e/data/cluster-templates/aws-ec2-rke2-topology.yaml

@@ -39,7 +39,7 @@ spec:
         value: none
       - name: awsClusterIdentityName
         value: cluster-identity
-    version: ${RKE2_VERSION}
+    version: ${RKE2_KUBERNETES_VERSION}
     workers:
       machineDeployments:
         - class: default-worker

test/e2e/data/cluster-templates/azure-aks-topology.yaml

@@ -25,26 +25,26 @@ spec:
   clusterNetwork:
     pods:
       cidrBlocks:
-      - 192.168.0.0/16
+        - 192.168.0.0/16
   topology:
     classRef:
       name: azure-aks-example
       namespace: ${TOPOLOGY_NAMESPACE}
     variables:
-    - name: subscriptionID
-      value: ${AZURE_SUBSCRIPTION_ID}
-    - name: location
-      value: germanywestcentral
-    - name: resourceGroup
-      value: highlander-e2e-azure-aks
-    - name: azureClusterIdentityName
-      value: cluster-identity
-    version: ${KUBERNETES_VERSION}
+      - name: subscriptionID
+        value: ${AZURE_SUBSCRIPTION_ID}
+      - name: location
+        value: germanywestcentral
+      - name: resourceGroup
+        value: highlander-e2e-azure-aks
+      - name: azureClusterIdentityName
+        value: cluster-identity
+    version: ${AZURE_AKS_KUBERNETES_VERSION}
     workers:
       machinePools:
-      - class: default-system
-        name: system-1
-        replicas: 1
-      - class: default-worker
-        name: worker-1
-        replicas: 1
+        - class: default-system
+          name: system-1
+          replicas: 1
+        - class: default-worker
+          name: worker-1
+          replicas: 1

test/e2e/data/cluster-templates/azure-rke2-topology.yaml

@@ -1,20 +1,20 @@
-apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-kind: AzureClusterIdentity
-metadata:
-  annotations:
-    "helm.sh/resource-policy": keep
-  labels:
-    clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
-  name: cluster-identity
-  namespace: ${NAMESPACE}
-spec:
-  allowedNamespaces: {}
-  clientID: ${AZURE_CLIENT_ID}
-  clientSecret:
-    name: cluster-identity-secret
-    namespace: capz-system
-  tenantID: ${AZURE_TENANT_ID}
-  type: ServicePrincipal
+# apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+# kind: AzureClusterIdentity
+# metadata:
+#   annotations:
+#     "helm.sh/resource-policy": keep
+#   labels:
+#     clusterctl.cluster.x-k8s.io/move-hierarchy: "true"
+#   name: cluster-identity
+#   namespace: ${NAMESPACE}
+# spec:
+#   allowedNamespaces: {}
+#   clientID: ${AZURE_CLIENT_ID}
+#   clientSecret:
+#     name: cluster-identity-secret
+#     namespace: capz-system
+#   tenantID: ${AZURE_TENANT_ID}
+#   type: ServicePrincipal
 ---
 apiVersion: cluster.x-k8s.io/v1beta2
 kind: Cluster
@@ -29,26 +29,25 @@ spec:
   clusterNetwork:
     pods:
       cidrBlocks:
-      - 192.168.0.0/16
+        - 192.168.0.0/16
   topology:
     classRef:
       name: azure-rke2-example
       namespace: ${TOPOLOGY_NAMESPACE}
     controlPlane:
       replicas: 3
     variables:
-    - name: subscriptionID
-      value: ${AZURE_SUBSCRIPTION_ID}
-    - name: location
-      value: germanywestcentral
-    - name: resourceGroup
-      value: highlander-e2e-azure-rke2
-    - name: azureClusterIdentityName
-      value: cluster-identity
-    version: ${RKE2_VERSION}
+      - name: subscriptionID
+        value: ${AZURE_SUBSCRIPTION_ID}
+      - name: location
+        value: germanywestcentral
+      - name: resourceGroup
+        value: highlander-e2e-azure-rke2
+      - name: azureClusterIdentityName
+        value: cluster-identity
+    version: ${RKE2_KUBERNETES_VERSION}
     workers:
       machineDeployments:
-      - class: rke2-default-worker
-        name: md-0
-        replicas: 3
-
+        - class: rke2-default-worker
+          name: md-0
+          replicas: 3

test/e2e/data/cluster-templates/docker-rke2-topology.yaml

@@ -29,7 +29,7 @@ spec:
       value: kindest/node:${KUBERNETES_VERSION}
     - name: dockerAuthSecret
       value: '${CLUSTER_NAME}-docker-token'
-    version: ${RKE2_VERSION}
+    version: ${RKE2_KUBERNETES_VERSION}
     workers:
       machineDeployments:
       - class: default-worker

test/e2e/data/cluster-templates/docker-rke2-v1beta1-topology.yaml

@@ -25,10 +25,10 @@ spec:
       - name: rke2CNI
         value: ${RKE2_CNI}
       - name: dockerImage
-        value: kindest/node:${KUBERNETES_VERSION}
+        value: kindest/node:${KUBERNETES_V1BETA1_VERSION}
       - name: dockerAuthSecret
         value: "${CLUSTER_NAME}-docker-token"
-    version: ${RKE2_VERSION}
+    version: ${RKE2_V1BETA1_KUBERNETES_VERSION}
     workers:
       machineDeployments:
         - class: default-worker

test/e2e/data/cluster-templates/vsphere-rke2-topology.yaml

@@ -36,7 +36,7 @@ spec:
     classRef:
       name: vsphere-rke2-example
       namespace: ${TOPOLOGY_NAMESPACE}
-    version: ${RKE2_VERSION}
+    version: ${RKE2_KUBERNETES_VERSION}
     controlPlane:
       replicas: ${CONTROL_PLANE_MACHINE_COUNT}
     workers: