wip - isolating e2e

Signed-off-by: Danil-Grigorev <[email protected]>

Author: Danil-Grigorev

templates/cluster-template-clusterclass-rke2.yaml

@@ -5,6 +5,11 @@ metadata:
 spec:
   template:
     spec:
+      image:
+        computeGallery:
+          gallery: replace-me
+          name: replace-me
+          version: replace-me
       osDisk:
         diskSizeGB: 128
         osType: Linux

templates/flavors/clusterclass-rke2/azure-machine-template-controlplane.yaml

@@ -6,6 +6,7 @@ resources:
 - ../../../flavors/clusterclass-rke2/rke2-controlplane-template.yaml
 - ../../../flavors/clusterclass-rke2/azure-cluster-template.yaml
 - ../../../flavors/clusterclass-rke2/azure-machine-template-controlplane.yaml
+- ../../../flavors/clusterclass-rke2/azure-machine-template-worker.yaml
 - rke2-config-template.yaml
 - ../../../azure-cluster-identity
 patches:

templates/test/ci/cluster-template-prow-clusterclass-ci-rke2.yaml

@@ -36,13 +36,13 @@ spec:
               path: "/spec/template/spec/files/-"
               valueFrom:
                 template: |
-                  - contentFrom:
-                      secret:
-                        key: control-plane-azure.json
-                        name: "{{ .builtin.controlPlane.machineTemplate.infrastructureRef.name }}-azure-json"
-                    owner: root:root
-                    path: /etc/kubernetes/azure.json
-                    permissions: "0644"
+                  contentFrom:
+                    secret:
+                      key: control-plane-azure.json
+                      name: "{{ .builtin.controlPlane.machineTemplate.infrastructureRef.name }}-azure-json"
+                  owner: root:root
+                  path: /etc/kubernetes/azure.json
+                  permissions: "0644"
     - name: workerAzureJsonSecretName
       definitions:
         - selector:
@@ -127,6 +127,42 @@ spec:
               path: /spec/template/spec/vmSize
               valueFrom:
                 variable: controlPlaneMachineType
+    - name: controlPlaneMachineGalleryVersionPatch
+      definitions:
+        - selector:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: AzureMachineTemplate
+            matchResources:
+              controlPlane: true
+          jsonPatches:
+            - op: replace
+              path: "/spec/template/spec/image/computeGallery/version"
+              valueFrom:
+                template: '{{ trimSuffix "+rke2r1" .builtin.cluster.topology.version }}'
+    - name: controlPlaneMachineGalleryNamePatch
+      definitions:
+        - selector:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: AzureMachineTemplate
+            matchResources:
+              controlPlane: true
+          jsonPatches:
+            - op: replace
+              path: "/spec/template/spec/image/computeGallery/name"
+              valueFrom:
+                variable: galleryName
+    - name: controlPlaneMachineGalleryPatch
+      definitions:
+        - selector:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: AzureMachineTemplate
+            matchResources:
+              controlPlane: true
+          jsonPatches:
+            - op: replace
+              path: "/spec/template/spec/image/computeGallery/gallery"
+              valueFrom:
+                variable: gallery
     - name: workerMachineType
       definitions:
         - selector:
@@ -174,4 +210,3 @@ spec:
   template:
     spec:
       sshPublicKey: ""
-      vmSize: replace_me

templates/test/ci/cluster-template-prow-topology-rke2.yaml

@@ -68,3 +68,15 @@ spec:
         openAPIV3Schema:
           type: string
           default: ""
+    - name: galleryName
+      required: true
+      schema:
+        openAPIV3Schema:
+          type: string
+          default: ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019
+    - name: gallery
+      required: true
+      schema:
+        openAPIV3Schema:
+          type: string
+          default: capi-ubun2-2404