[WIP] Test changing subnet CIDRs

azure/services/subnets/subnets.go

@@ -28,6 +28,7 @@
 	"sigs.k8s.io/cluster-api-provider-azure/azure/converters"
 	"sigs.k8s.io/cluster-api-provider-azure/azure/services/aso"
 	"sigs.k8s.io/cluster-api-provider-azure/util/slice"
+	"sigs.k8s.io/cluster-api-provider-azure/util/tele"
 )
 
 const serviceName = "subnets"
@@ -50,14 +51,20 @@
 	return svc
 }
 
-func postCreateOrUpdateResourceHook(_ context.Context, scope SubnetScope, subnet *asonetworkv1.VirtualNetworksSubnet, err error) error {
+func postCreateOrUpdateResourceHook(ctx context.Context, scope SubnetScope, subnet *asonetworkv1.VirtualNetworksSubnet, err error) error {
+	ctx, log, done := tele.StartSpanWithLogger(ctx, "subnets.Service.postCreateOrUpdateResourceHook")
+	defer done()
+
 	if err != nil {
 		return err
 	}
 
 	name := subnet.AzureName()
+	log.Info("Got subnet", "name", name, "subnet", subnet)
 	scope.UpdateSubnetID(name, ptr.Deref(subnet.Status.Id, ""))
+	log.Info("Subnet ID is updated", "name", name, "id", ptr.Deref(subnet.Status.Id, ""))
 	scope.UpdateSubnetCIDRs(name, converters.GetSubnetAddresses(*subnet))
+	log.Info("Subnet CIDRs are updated", "name", name, "cidrs", converters.GetSubnetAddresses(*subnet))
 
 	return nil
 }

templates/cluster-template.yaml

@@ -36,11 +36,17 @@ spec:
           dnsName: ${CLUSTER_NAME}-${APISERVER_LB_DNS_SUFFIX}.${AZURE_LOCATION}.cloudapp.azure.com
           name: ${CLUSTER_NAME}-api-lb
     subnets:
-    - name: control-plane-subnet
+    - cidrBlocks:
+      - 10.0.0.0/20
+      name: control-plane-subnet
       role: control-plane
-    - name: node-subnet
+    - cidrBlocks:
+      - 10.0.16.0/20
+      name: node-subnet
       role: node
     vnet:
+      cidrBlocks:
+      - 10.0.0.0/16
       name: ${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet}
   resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}}
   subscriptionID: ${AZURE_SUBSCRIPTION_ID}

templates/flavors/base/cluster-template.yaml

@@ -27,11 +27,17 @@ spec:
   networkSpec:
     vnet:
       name: "${AZURE_VNET_NAME:=${CLUSTER_NAME}-vnet}"
+      cidrBlocks:
+      - 10.0.0.0/16
     subnets:
     - name: control-plane-subnet
       role: control-plane
+      cidrBlocks:
+        - 10.0.0.0/20
     - name: node-subnet
       role: node
+      cidrBlocks:
+        - 10.0.16.0/20
 ---
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1