Merge pull request #1401 from fiunchinho/fix-save-state-from-azure-api

Save subnet details back to scope

Author: k8s-ci-robot

azure/interfaces.go

@@ -64,6 +64,7 @@ type NetworkDescriber interface {
 	IsVnetManaged() bool
 	NodeSubnet() infrav1.SubnetSpec
 	ControlPlaneSubnet() infrav1.SubnetSpec
+	SetSubnet(infrav1.SubnetSpec)
 	IsIPv6Enabled() bool
 	NodeRouteTable() infrav1.RouteTable
 	ControlPlaneRouteTable() infrav1.RouteTable

azure/mocks/service_mock.go

@@ -360,6 +360,16 @@ func (s *ClusterScope) NodeSubnet() infrav1.SubnetSpec {
 	return subnet
 }
 
+// SetSubnet sets the subnet spec for the subnet with the same role.
+func (s *ClusterScope) SetSubnet(subnetSpec infrav1.SubnetSpec) {
+	for i, sn := range s.AzureCluster.Spec.NetworkSpec.Subnets {
+		if sn.Role == subnetSpec.Role {
+			s.AzureCluster.Spec.NetworkSpec.Subnets[i] = subnetSpec
+			return
+		}
+	}
+}
+
 // ControlPlaneRouteTable returns the cluster controlplane routetable.
 func (s *ClusterScope) ControlPlaneRouteTable() infrav1.RouteTable {
 	subnet, _ := s.AzureCluster.Spec.NetworkSpec.GetControlPlaneSubnet()

azure/scope/cluster.go

@@ -198,6 +198,12 @@ func (s *ManagedControlPlaneScope) NodeSubnet() infrav1.SubnetSpec {
 	}
 }
 
+// SetSubnet sets the passed subnet spec into the scope.
+// This is not used when using a managed control plane.
+func (s *ManagedControlPlaneScope) SetSubnet(subnetSpec infrav1.SubnetSpec) {
+	// no-op
+}
+
 // ControlPlaneSubnet returns the cluster control plane subnet.
 func (s *ManagedControlPlaneScope) ControlPlaneSubnet() infrav1.SubnetSpec {
 	return infrav1.SubnetSpec{}

azure/scope/managedcontrolplane.go

@@ -72,6 +72,7 @@ func (s *Service) Reconcile(ctx context.Context) error {
 			// currently don't support specifying your own routes via spec
 			routeTableSpec.Subnet.RouteTable.Name = to.String(existingRouteTable.Name)
 			routeTableSpec.Subnet.RouteTable.ID = to.String(existingRouteTable.ID)
+			s.Scope.SetSubnet(routeTableSpec.Subnet)
 
 			continue
 		}

azure/services/bastionhosts/mocks_bastionhosts/bastionhosts_mock.go

@@ -142,13 +142,29 @@ func TestReconcileRouteTables(t *testing.T) {
 					Name: to.StringPtr("my-cp-routetable"),
 					ID:   to.StringPtr("1"),
 				}, nil)
+				s.SetSubnet(infrav1.SubnetSpec{
+					Name: "control-plane-subnet",
+					Role: infrav1.SubnetControlPlane,
+					RouteTable: infrav1.RouteTable{
+						ID:   "1",
+						Name: "my-cp-routetable",
+					},
+				}).Times(1)
 				s.NodeSubnet().AnyTimes().Return(infrav1.SubnetSpec{Name: "node-subnet", Role: infrav1.SubnetNode})
 				s.NodeRouteTable().AnyTimes().Return(infrav1.RouteTable{Name: "my-node-routetable"})
 				s.ResourceGroup().AnyTimes().Return("my-rg")
 				m.Get(gomockinternal.AContext(), "my-rg", "my-node-routetable").Return(network.RouteTable{
 					Name: to.StringPtr("my-node-routetable"),
 					ID:   to.StringPtr("2"),
 				}, nil)
+				s.SetSubnet(infrav1.SubnetSpec{
+					Name: "node-subnet",
+					Role: infrav1.SubnetNode,
+					RouteTable: infrav1.RouteTable{
+						ID:   "2",
+						Name: "my-node-routetable",
+					},
+				}).Times(1)
 			},
 		},
 		{