wip - isolating e2e

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

Author: Danil-Grigorev

azure/scope/cluster.go

@@ -1031,13 +1031,10 @@ func (s *ClusterScope) SetControlPlaneSecurityRules() {
 	subnet := s.ControlPlaneSubnet()
 
 	if subnet.SecurityGroup.SecurityRules == nil {
-		subnet := s.ControlPlaneSubnet()
-
 		s.AzureCluster.Spec.NetworkSpec.UpdateControlPlaneSubnet(subnet)
 	}
 
 	if subnet.GetSecurityRuleByDestination("22") == nil {
-		subnet := s.ControlPlaneSubnet()
 		subnet.SecurityGroup.SecurityRules = append(s.ControlPlaneSubnet().SecurityGroup.SecurityRules,
 			infrav1.SecurityRule{
 				Name:             "allow_ssh",
@@ -1057,7 +1054,6 @@ func (s *ClusterScope) SetControlPlaneSecurityRules() {
 
 	port := strconv.Itoa(int(s.APIServerPort()))
 	if subnet.GetSecurityRuleByDestination(port) == nil {
-		subnet := s.ControlPlaneSubnet()
 		subnet.SecurityGroup.SecurityRules = append(s.ControlPlaneSubnet().SecurityGroup.SecurityRules, infrav1.SecurityRule{
 			Name:             "allow_apiserver",
 			Description:      "Allow K8s API Server",

templates/cluster-template-clusterclass-rke2.yaml

@@ -10,7 +10,7 @@ spec:
         kind: AzureClusterIdentity
         name: ${CLUSTER_IDENTITY_NAME}
       networkSpec:
-        additionalAPIServerLBPorts:
+        additionalControlPlaneLBPorts:
         - name: rke2
           port: 9345
         subnets:
@@ -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