💎 cleanup: VM and VNet spec no longer return arrays

cloud/scope/cluster.go

@@ -229,14 +229,12 @@ func (s *ClusterScope) SubnetSpecs() []azure.SubnetSpec {
 	}
 }
 
-// VNetSpecs returns the virtual network specs.
-func (s *ClusterScope) VNetSpecs() []azure.VNetSpec {
-	return []azure.VNetSpec{
-		{
-			ResourceGroup: s.Vnet().ResourceGroup,
-			Name:          s.Vnet().Name,
-			CIDRs:         s.Vnet().CIDRBlocks,
-		},
+// VNetSpec returns the virtual network spec.
+func (s *ClusterScope) VNetSpec() azure.VNetSpec {
+	return azure.VNetSpec{
+		ResourceGroup: s.Vnet().ResourceGroup,
+		Name:          s.Vnet().Name,
+		CIDRs:         s.Vnet().CIDRBlocks,
 	}
 }
 

cloud/scope/machine.go

@@ -88,23 +88,21 @@ type MachineScope struct {
 	AzureMachine *infrav1.AzureMachine
 }
 
-// VMSpecs returns the VM specs.
-func (m *MachineScope) VMSpecs() []azure.VMSpec {
-	return []azure.VMSpec{
-		{
-			Name:                   m.Name(),
-			Role:                   m.Role(),
-			NICNames:               m.NICNames(),
-			SSHKeyData:             m.AzureMachine.Spec.SSHPublicKey,
-			Size:                   m.AzureMachine.Spec.VMSize,
-			OSDisk:                 m.AzureMachine.Spec.OSDisk,
-			DataDisks:              m.AzureMachine.Spec.DataDisks,
-			Zone:                   m.AvailabilityZone(),
-			Identity:               m.AzureMachine.Spec.Identity,
-			UserAssignedIdentities: m.AzureMachine.Spec.UserAssignedIdentities,
-			SpotVMOptions:          m.AzureMachine.Spec.SpotVMOptions,
-			SecurityProfile:        m.AzureMachine.Spec.SecurityProfile,
-		},
+// VMSpec returns the VM spec.
+func (m *MachineScope) VMSpec() azure.VMSpec {
+	return azure.VMSpec{
+		Name:                   m.Name(),
+		Role:                   m.Role(),
+		NICNames:               m.NICNames(),
+		SSHKeyData:             m.AzureMachine.Spec.SSHPublicKey,
+		Size:                   m.AzureMachine.Spec.VMSize,
+		OSDisk:                 m.AzureMachine.Spec.OSDisk,
+		DataDisks:              m.AzureMachine.Spec.DataDisks,
+		Zone:                   m.AvailabilityZone(),
+		Identity:               m.AzureMachine.Spec.Identity,
+		UserAssignedIdentities: m.AzureMachine.Spec.UserAssignedIdentities,
+		SpotVMOptions:          m.AzureMachine.Spec.SpotVMOptions,
+		SecurityProfile:        m.AzureMachine.Spec.SecurityProfile,
 	}
 }
 

cloud/scope/managedcontrolplane.go

@@ -157,14 +157,12 @@ func (s *ManagedControlPlaneScope) Vnet() *infrav1.VnetSpec {
 	}
 }
 
-// VNetSpecs returns the virtual network specs.
-func (s *ManagedControlPlaneScope) VNetSpecs() []azure.VNetSpec {
-	return []azure.VNetSpec{
-		{
-			ResourceGroup: s.Vnet().ResourceGroup,
-			Name:          s.Vnet().Name,
-			CIDRs:         s.Vnet().CIDRBlocks,
-		},
+// VNetSpec returns the virtual network spec.
+func (s *ManagedControlPlaneScope) VNetSpec() azure.VNetSpec {
+	return azure.VNetSpec{
+		ResourceGroup: s.Vnet().ResourceGroup,
+		Name:          s.Vnet().Name,
+		CIDRs:         s.Vnet().CIDRBlocks,
 	}
 }
 

cloud/services/virtualmachines/service.go

@@ -33,7 +33,7 @@ import (
 type VMScope interface {
 	logr.Logger
 	azure.ClusterDescriber
-	VMSpecs() []azure.VMSpec
+	VMSpec() azure.VMSpec
 	GetBootstrapData(ctx context.Context) (string, error)
 	GetVMImage() (*infrav1.Image, error)
 	SetAnnotation(string, string)

cloud/services/virtualmachines/virtualmachines.go

@@ -40,131 +40,130 @@ func (s *Service) Reconcile(ctx context.Context) error {
 	ctx, span := tele.Tracer().Start(ctx, "virtualmachines.Service.Reconcile")
 	defer span.End()
 
-	for _, vmSpec := range s.Scope.VMSpecs() {
-		existingVM, err := s.getExisting(ctx, vmSpec.Name)
-		switch {
-		case err != nil && !azure.ResourceNotFound(err):
-			return errors.Wrapf(err, "failed to get VM %s", vmSpec.Name)
-		case err == nil:
-			// VM already exists, update the spec and skip creation.
-			s.Scope.SetProviderID(fmt.Sprintf("azure:///%s", existingVM.ID))
-			s.Scope.SetAnnotation("cluster-api-provider-azure", "true")
-			s.Scope.SetAddresses(existingVM.Addresses)
-			s.Scope.SetVMState(existingVM.State)
-		default:
-			s.Scope.V(2).Info("creating VM", "vm", vmSpec.Name)
-			sku, err := s.ResourceSKUCache.Get(ctx, vmSpec.Size, resourceskus.VirtualMachines)
-			if err != nil {
-				return errors.Wrapf(err, "failed to get find vm sku %s in compute api", vmSpec.Size)
-			}
+	vmSpec := s.Scope.VMSpec()
+	existingVM, err := s.getExisting(ctx, vmSpec.Name)
+	switch {
+	case err != nil && !azure.ResourceNotFound(err):
+		return errors.Wrapf(err, "failed to get VM %s", vmSpec.Name)
+	case err == nil:
+		// VM already exists, update the spec and skip creation.
+		s.Scope.SetProviderID(fmt.Sprintf("azure:///%s", existingVM.ID))
+		s.Scope.SetAnnotation("cluster-api-provider-azure", "true")
+		s.Scope.SetAddresses(existingVM.Addresses)
+		s.Scope.SetVMState(existingVM.State)
+	default:
+		s.Scope.V(2).Info("creating VM", "vm", vmSpec.Name)
+		sku, err := s.ResourceSKUCache.Get(ctx, vmSpec.Size, resourceskus.VirtualMachines)
+		if err != nil {
+			return errors.Wrapf(err, "failed to get find vm sku %s in compute api", vmSpec.Size)
+		}
 
-			storageProfile, err := s.generateStorageProfile(ctx, vmSpec, sku)
-			if err != nil {
-				return err
-			}
+		storageProfile, err := s.generateStorageProfile(ctx, vmSpec, sku)
+		if err != nil {
+			return err
+		}
 
-			securityProfile, err := getSecurityProfile(vmSpec, sku)
-			if err != nil {
-				return err
-			}
+		securityProfile, err := getSecurityProfile(vmSpec, sku)
+		if err != nil {
+			return err
+		}
 
-			nicRefs := make([]compute.NetworkInterfaceReference, len(vmSpec.NICNames))
-			for i, nicName := range vmSpec.NICNames {
-				primary := i == 0
-				nicRefs[i] = compute.NetworkInterfaceReference{
-					ID: to.StringPtr(azure.NetworkInterfaceID(s.Scope.SubscriptionID(), s.Scope.ResourceGroup(), nicName)),
-					NetworkInterfaceReferenceProperties: &compute.NetworkInterfaceReferenceProperties{
-						Primary: to.BoolPtr(primary),
-					},
-				}
+		nicRefs := make([]compute.NetworkInterfaceReference, len(vmSpec.NICNames))
+		for i, nicName := range vmSpec.NICNames {
+			primary := i == 0
+			nicRefs[i] = compute.NetworkInterfaceReference{
+				ID: to.StringPtr(azure.NetworkInterfaceID(s.Scope.SubscriptionID(), s.Scope.ResourceGroup(), nicName)),
+				NetworkInterfaceReferenceProperties: &compute.NetworkInterfaceReferenceProperties{
+					Primary: to.BoolPtr(primary),
+				},
 			}
+		}
 
-			priority, evictionPolicy, billingProfile, err := getSpotVMOptions(vmSpec.SpotVMOptions)
-			if err != nil {
-				return errors.Wrapf(err, "failed to get Spot VM options")
-			}
+		priority, evictionPolicy, billingProfile, err := getSpotVMOptions(vmSpec.SpotVMOptions)
+		if err != nil {
+			return errors.Wrapf(err, "failed to get Spot VM options")
+		}
 
-			sshKey, err := base64.StdEncoding.DecodeString(vmSpec.SSHKeyData)
-			if err != nil {
-				return errors.Wrapf(err, "failed to decode ssh public key")
-			}
-			bootstrapData, err := s.Scope.GetBootstrapData(ctx)
-			if err != nil {
-				return errors.Wrap(err, "failed to retrieve bootstrap data")
-			}
+		sshKey, err := base64.StdEncoding.DecodeString(vmSpec.SSHKeyData)
+		if err != nil {
+			return errors.Wrapf(err, "failed to decode ssh public key")
+		}
+		bootstrapData, err := s.Scope.GetBootstrapData(ctx)
+		if err != nil {
+			return errors.Wrap(err, "failed to retrieve bootstrap data")
+		}
 
-			virtualMachine := compute.VirtualMachine{
-				Plan:     s.generateImagePlan(),
-				Location: to.StringPtr(s.Scope.Location()),
-				Tags: converters.TagsToMap(infrav1.Build(infrav1.BuildParams{
-					ClusterName: s.Scope.ClusterName(),
-					Lifecycle:   infrav1.ResourceLifecycleOwned,
-					Name:        to.StringPtr(vmSpec.Name),
-					Role:        to.StringPtr(vmSpec.Role),
-					Additional:  s.Scope.AdditionalTags(),
-				})),
-				VirtualMachineProperties: &compute.VirtualMachineProperties{
-					HardwareProfile: &compute.HardwareProfile{
-						VMSize: compute.VirtualMachineSizeTypes(vmSpec.Size),
-					},
-					StorageProfile:  storageProfile,
-					SecurityProfile: securityProfile,
-					OsProfile: &compute.OSProfile{
-						ComputerName:  to.StringPtr(vmSpec.Name),
-						AdminUsername: to.StringPtr(azure.DefaultUserName),
-						CustomData:    to.StringPtr(bootstrapData),
-						LinuxConfiguration: &compute.LinuxConfiguration{
-							DisablePasswordAuthentication: to.BoolPtr(true),
-							SSH: &compute.SSHConfiguration{
-								PublicKeys: &[]compute.SSHPublicKey{
-									{
-										Path:    to.StringPtr(fmt.Sprintf("/home/%s/.ssh/authorized_keys", azure.DefaultUserName)),
-										KeyData: to.StringPtr(string(sshKey)),
-									},
+		virtualMachine := compute.VirtualMachine{
+			Plan:     s.generateImagePlan(),
+			Location: to.StringPtr(s.Scope.Location()),
+			Tags: converters.TagsToMap(infrav1.Build(infrav1.BuildParams{
+				ClusterName: s.Scope.ClusterName(),
+				Lifecycle:   infrav1.ResourceLifecycleOwned,
+				Name:        to.StringPtr(vmSpec.Name),
+				Role:        to.StringPtr(vmSpec.Role),
+				Additional:  s.Scope.AdditionalTags(),
+			})),
+			VirtualMachineProperties: &compute.VirtualMachineProperties{
+				HardwareProfile: &compute.HardwareProfile{
+					VMSize: compute.VirtualMachineSizeTypes(vmSpec.Size),
+				},
+				StorageProfile:  storageProfile,
+				SecurityProfile: securityProfile,
+				OsProfile: &compute.OSProfile{
+					ComputerName:  to.StringPtr(vmSpec.Name),
+					AdminUsername: to.StringPtr(azure.DefaultUserName),
+					CustomData:    to.StringPtr(bootstrapData),
+					LinuxConfiguration: &compute.LinuxConfiguration{
+						DisablePasswordAuthentication: to.BoolPtr(true),
+						SSH: &compute.SSHConfiguration{
+							PublicKeys: &[]compute.SSHPublicKey{
+								{
+									Path:    to.StringPtr(fmt.Sprintf("/home/%s/.ssh/authorized_keys", azure.DefaultUserName)),
+									KeyData: to.StringPtr(string(sshKey)),
 								},
 							},
 						},
 					},
-					NetworkProfile: &compute.NetworkProfile{
-						NetworkInterfaces: &nicRefs,
-					},
-					Priority:       priority,
-					EvictionPolicy: evictionPolicy,
-					BillingProfile: billingProfile,
-					DiagnosticsProfile: &compute.DiagnosticsProfile{
-						BootDiagnostics: &compute.BootDiagnostics{
-							Enabled: to.BoolPtr(true),
-						},
+				},
+				NetworkProfile: &compute.NetworkProfile{
+					NetworkInterfaces: &nicRefs,
+				},
+				Priority:       priority,
+				EvictionPolicy: evictionPolicy,
+				BillingProfile: billingProfile,
+				DiagnosticsProfile: &compute.DiagnosticsProfile{
+					BootDiagnostics: &compute.BootDiagnostics{
+						Enabled: to.BoolPtr(true),
 					},
 				},
-			}
+			},
+		}
 
-			if vmSpec.Zone != "" {
-				zones := []string{vmSpec.Zone}
-				virtualMachine.Zones = &zones
-			}
+		if vmSpec.Zone != "" {
+			zones := []string{vmSpec.Zone}
+			virtualMachine.Zones = &zones
+		}
 
-			if vmSpec.Identity == infrav1.VMIdentitySystemAssigned {
-				virtualMachine.Identity = &compute.VirtualMachineIdentity{
-					Type: compute.ResourceIdentityTypeSystemAssigned,
-				}
-			} else if vmSpec.Identity == infrav1.VMIdentityUserAssigned {
-				userIdentitiesMap, err := converters.UserAssignedIdentitiesToVMSDK(vmSpec.UserAssignedIdentities)
-				if err != nil {
-					return errors.Wrapf(err, "failed to assign identity %q", vmSpec.Name)
-				}
-				virtualMachine.Identity = &compute.VirtualMachineIdentity{
-					Type:                   compute.ResourceIdentityTypeUserAssigned,
-					UserAssignedIdentities: userIdentitiesMap,
-				}
+		if vmSpec.Identity == infrav1.VMIdentitySystemAssigned {
+			virtualMachine.Identity = &compute.VirtualMachineIdentity{
+				Type: compute.ResourceIdentityTypeSystemAssigned,
 			}
-
-			if err := s.Client.CreateOrUpdate(ctx, s.Scope.ResourceGroup(), vmSpec.Name, virtualMachine); err != nil {
-				return errors.Wrapf(err, "failed to create VM %s in resource group %s", vmSpec.Name, s.Scope.ResourceGroup())
+		} else if vmSpec.Identity == infrav1.VMIdentityUserAssigned {
+			userIdentitiesMap, err := converters.UserAssignedIdentitiesToVMSDK(vmSpec.UserAssignedIdentities)
+			if err != nil {
+				return errors.Wrapf(err, "failed to assign identity %q", vmSpec.Name)
+			}
+			virtualMachine.Identity = &compute.VirtualMachineIdentity{
+				Type:                   compute.ResourceIdentityTypeUserAssigned,
+				UserAssignedIdentities: userIdentitiesMap,
 			}
+		}
 
-			s.Scope.V(2).Info("successfully created VM", "vm", vmSpec.Name)
+		if err := s.Client.CreateOrUpdate(ctx, s.Scope.ResourceGroup(), vmSpec.Name, virtualMachine); err != nil {
+			return errors.Wrapf(err, "failed to create VM %s in resource group %s", vmSpec.Name, s.Scope.ResourceGroup())
 		}
+
+		s.Scope.V(2).Info("successfully created VM", "vm", vmSpec.Name)
 	}
 
 	return nil
@@ -175,19 +174,18 @@ func (s *Service) Delete(ctx context.Context) error {
 	ctx, span := tele.Tracer().Start(ctx, "virtualmachines.Service.Delete")
 	defer span.End()
 
-	for _, vmSpec := range s.Scope.VMSpecs() {
-		s.Scope.V(2).Info("deleting VM", "vm", vmSpec.Name)
-		err := s.Client.Delete(ctx, s.Scope.ResourceGroup(), vmSpec.Name)
-		if err != nil && azure.ResourceNotFound(err) {
-			// already deleted
-			continue
-		}
-		if err != nil {
-			return errors.Wrapf(err, "failed to delete VM %s in resource group %s", vmSpec.Name, s.Scope.ResourceGroup())
-		}
-
-		s.Scope.V(2).Info("successfully deleted VM", "vm", vmSpec.Name)
+	vmSpec := s.Scope.VMSpec()
+	s.Scope.V(2).Info("deleting VM", "vm", vmSpec.Name)
+	err := s.Client.Delete(ctx, s.Scope.ResourceGroup(), vmSpec.Name)
+	if err != nil && azure.ResourceNotFound(err) {
+		// already deleted
+		return nil
 	}
+	if err != nil {
+		return errors.Wrapf(err, "failed to delete VM %s in resource group %s", vmSpec.Name, s.Scope.ResourceGroup())
+	}
+
+	s.Scope.V(2).Info("successfully deleted VM", "vm", vmSpec.Name)
 	return nil
 }