wip - isolating e2e

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

Author: Danil-Grigorev

templates/cluster-template-clusterclass-rke2.yaml

@@ -29,4 +29,6 @@ spec:
                 sourcePorts: "*"
                 action: "Allow"
         - name: node-subnet
+          natGateway:
+            name: node-natgateway
           role: node

templates/flavors/clusterclass-rke2/azure-cluster-template.yaml

@@ -8,4 +8,3 @@ spec:
       osDisk:
         diskSizeGB: 128
         osType: Linux
-      sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}

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

@@ -8,4 +8,3 @@ spec:
       osDisk:
         diskSizeGB: 30
         osType: Linux
-      sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}

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

@@ -0,0 +1,13 @@
+apiVersion: addons.cluster.x-k8s.io/v1alpha1
+kind: HelmChartProxy
+metadata:
+  name: cloud-provider-azure-chart
+spec:
+  valuesTemplate: |
+    infra:
+      clusterName: {{ .Cluster.metadata.name }}
+    cloudControllerManager:
+      clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }}
+      logVerbosity: 4
+      nodeSelector:
+        node-role.kubernetes.io/control-plane: "true"

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

@@ -6,11 +6,15 @@ 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
+- ../../../addons/cluster-api-helm/calico.yaml
+- ../../../addons/cluster-api-helm/cloud-provider-azure.yaml
 patches:
 - path: patches.yaml
 - path: variables.yaml
+- path: ccm-patch.yaml
 
 sortOptions:
   order: fifo

templates/test/ci/cluster-template-prow-topology-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,38 @@ spec:
               path: /spec/template/spec/vmSize
               valueFrom:
                 variable: controlPlaneMachineType
+    - name: controlPlaneMachineGalleryPatch
+      definitions:
+        - selector:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: AzureMachineTemplate
+            matchResources:
+              controlPlane: true
+              machineDeploymentClass:
+                names:
+                - ${CLUSTER_NAME}-worker
+          jsonPatches:
+            - op: add
+              path: "/spec/template/spec/image"
+              valueFrom:
+                template: |
+                  computeGallery:
+                    version: {{ trimPrefix "v" (trimSuffix "+rke2r1" .builtin.cluster.topology.version) }}
+                    name: {{ .galleryName }}
+                    gallery: {{ .gallery }}
+    - definitions:
+      - jsonPatches:
+        - op: add
+          path: "/spec/template/spec/resourceGroup"
+          valueFrom:
+            variable: resourceGroup
+        selector:
+          apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+          kind: AzureClusterTemplate
+          matchResources:
+            infrastructureCluster: true
+      enabledIf: "{{ if .resourceGroup }}true{{end}}"
+      name: clusterResourceGroupPatch
     - name: workerMachineType
       definitions:
         - selector:
@@ -147,6 +179,7 @@ spec:
             apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
             kind: AzureMachineTemplate
             matchResources:
+              controlPlane: true
               machineDeploymentClass:
                 names:
                   - ${CLUSTER_NAME}-worker
@@ -165,13 +198,3 @@ spec:
     spec:
       additionalTags:
         replace_me_key: replace_me_val
----
-apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-kind: AzureMachineTemplate
-metadata:
-  name: ${CLUSTER_NAME}-control-plane
-spec:
-  template:
-    spec:
-      sshPublicKey: ""
-      vmSize: replace_me