Integrate bm

Makefile

@@ -88,6 +88,11 @@ KUBECTL_VER := v1.21.4
 KUBECTL_BIN := kubectl
 KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
 
+TAGSUFFIX_APPEND :=
+ifdef TAGSUFFIX
+    TAGSUFFIX_APPEND := -${TAGSUFFIX}
+endif
+
 # Version
 MAJOR_VER ?= 0
 MINOR_VER ?= 4
@@ -99,7 +104,7 @@ STAGING_REGISTRY := mocimages.azurecr.io
 PROD_REGISTRY := mocimages.azurecr.io
 IMAGE_NAME ?= caphcontroller
 CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
-TAG := $(MAJOR_VER).$(MINOR_VER).$(PATCH_VER)
+TAG := $(MAJOR_VER).$(MINOR_VER).$(PATCH_VER)${TAGSUFFIX_APPEND}
 ARCH := amd64
 ALL_ARCH = amd64 arm arm64 ppc64le s390x
 

api/v1alpha3/azurestackhciloadbalancer_types.go

@@ -31,7 +31,11 @@ const (
 type AzureStackHCILoadBalancerSpec struct {
 	SSHPublicKey string `json:"sshPublicKey"`
 	Image        Image  `json:"image"`
-	VMSize       string `json:"vmSize"`
+
+	// +optional
+	HostType HostType `json:"hostType,omitempty"`
+
+	VMSize string `json:"vmSize"`
 
 	// Number of desired loadbalancer machines. Defaults to 1.
 	// This is a pointer to distinguish between explicit zero and not specified.

api/v1alpha3/azurestackhcimachine_types.go

@@ -36,6 +36,9 @@ type AzureStackHCIMachineSpec struct {
 	// +optional
 	ProviderID *string `json:"providerID,omitempty"`
 
+	// +optional
+	HostType HostType `json:"hostType,omitempty"`
+
 	VMSize string `json:"vmSize"`
 
 	AvailabilityZone AvailabilityZone `json:"availabilityZone,omitempty"`

api/v1alpha3/azurestackhcivirtualmachine_types.go

@@ -32,6 +32,9 @@ const (
 
 // AzureStackHCIVirtualMachineSpec defines the desired state of AzureStackHCIVirtualMachine
 type AzureStackHCIVirtualMachineSpec struct {
+	// +optional
+	HostType HostType `json:"hostType,omitempty"`
+
 	VMSize           string           `json:"vmSize"`
 	AvailabilityZone AvailabilityZone `json:"availabilityZone,omitempty"`
 	Image            Image            `json:"image"`

api/v1alpha3/types.go

@@ -222,3 +222,15 @@ const (
 	ValueReady                           = "true"
 	AnnotationControlPlaneReady          = "azurestackhci.cluster.sigs.k8s.io/control-plane-ready"
 )
+
+// HostType specifies what type of machine a node should be deployed on.
+type HostType string
+
+const (
+	// HostTypeVM specifies that the node should be deployed on a virtual machine.
+	// Default value.
+	HostTypeVM = HostType("vm")
+
+	// HostTypeBareMetal specifies that the node should be deployed on a bare metal machine.
+	HostTypeBareMetal = HostType("baremetal")
+)

api/v1alpha4/azurestackhciloadbalancer_types.go

@@ -38,6 +38,9 @@ type AzureStackHCILoadBalancerSpec struct {
 	// +optional
 	// +kubebuilder:default=1
 	Replicas *int32 `json:"replicas,omitempty"`
+
+	// +optional
+	HostType HostType `json:"hostType,omitempty"`
 }
 
 type AzureStackHCILoadBalancerStatus struct {

api/v1alpha4/azurestackhcimachine_types.go

@@ -36,6 +36,9 @@ type AzureStackHCIMachineSpec struct {
 	// +optional
 	ProviderID *string `json:"providerID,omitempty"`
 
+	// +optional
+	HostType HostType `json:"hostType,omitempty"`
+
 	VMSize string `json:"vmSize"`
 
 	AvailabilityZone AvailabilityZone `json:"availabilityZone,omitempty"`

api/v1alpha4/azurestackhcivirtualmachine_types.go

@@ -32,6 +32,9 @@ const (
 
 // AzureStackHCIVirtualMachineSpec defines the desired state of AzureStackHCIVirtualMachine
 type AzureStackHCIVirtualMachineSpec struct {
+	// +optional
+	HostType HostType `json:"hostType,omitempty"`
+
 	VMSize           string           `json:"vmSize"`
 	AvailabilityZone AvailabilityZone `json:"availabilityZone,omitempty"`
 	Image            Image            `json:"image"`

api/v1alpha4/types.go

@@ -222,3 +222,15 @@ const (
 	ValueReady                           = "true"
 	AnnotationControlPlaneReady          = "azurestackhci.cluster.sigs.k8s.io/control-plane-ready"
 )
+
+// HostType specifies what type of machine a node should be deployed on.
+type HostType string
+
+const (
+	// HostTypeVM specifies that the node should be deployed on a virtual machine.
+	// Default value.
+	HostTypeVM = HostType("vm")
+
+	// HostTypeBareMetal specifies that the node should be deployed on a bare metal machine.
+	HostTypeBareMetal = HostType("baremetal")
+)

cloud/converters/vm.go

@@ -23,8 +23,18 @@ import (
 	"github.com/microsoft/moc-sdk-for-go/services/compute"
 )
 
-// SDKToVM converts an SDK VirtualMachine to the provider VM type.
-func SDKToVM(v compute.VirtualMachine) (*infrav1.VM, error) {
+// VMConvertToCAPH converts an SDK VirtualMachine to the provider VM type.
+func VMConvertToCAPH(v compute.VirtualMachine) (*infrav1.VM, error) {
+	vm := &infrav1.VM{
+		ID:    to.String(v.ID),
+		Name:  to.String(v.Name),
+		State: infrav1.VMStateSucceeded, // Hard-coded for now until we expose provisioning state
+	}
+	return vm, nil
+}
+
+// BareMetalMachineConvertToCAPH converts an SDK BareMetalMachine to the provider VM type.
+func BareMetalMachineConvertToCAPH(v compute.BareMetalMachine) (*infrav1.VM, error) {
 	vm := &infrav1.VM{
 		ID:    to.String(v.ID),
 		Name:  to.String(v.Name),

cloud/services/virtualmachines/service.go

@@ -20,16 +20,18 @@ package virtualmachines
 import (
 	azurestackhci "github.com/microsoft/cluster-api-provider-azurestackhci/cloud"
 	"github.com/microsoft/cluster-api-provider-azurestackhci/cloud/scope"
-	"github.com/microsoft/moc/pkg/auth"
+	"github.com/microsoft/moc-sdk-for-go/services/compute/baremetalmachine"
 	"github.com/microsoft/moc-sdk-for-go/services/compute/virtualmachine"
+	"github.com/microsoft/moc/pkg/auth"
 )
 
 var _ azurestackhci.Service = (*Service)(nil)
 
 // Service provides operations on virtual machines.
 type Service struct {
-	Client virtualmachine.VirtualMachineClient
-	Scope  scope.ScopeInterface
+	VMClient        virtualmachine.VirtualMachineClient
+	BareMetalClient baremetalmachine.BareMetalMachineClient
+	Scope           scope.ScopeInterface
 }
 
 // getVirtualMachinesClient creates a new virtual machines client.
@@ -38,10 +40,16 @@ func getVirtualMachinesClient(cloudAgentFqdn string, authorizer auth.Authorizer)
 	return *vmClient
 }
 
+func getBareMetalMachinesClient(cloudAgentFqdn string, authorizer auth.Authorizer) baremetalmachine.BareMetalMachineClient {
+	bareMetalClient, _ := baremetalmachine.NewBareMetalMachineClient(cloudAgentFqdn, authorizer)
+	return *bareMetalClient
+}
+
 // NewService creates a new virtual machines service.
 func NewService(scope scope.ScopeInterface) *Service {
 	return &Service{
-		Client: getVirtualMachinesClient(scope.GetCloudAgentFqdn(), scope.GetAuthorizer()),
-		Scope:  scope,
+		VMClient:        getVirtualMachinesClient(scope.GetCloudAgentFqdn(), scope.GetAuthorizer()),
+		BareMetalClient: getBareMetalMachinesClient(scope.GetCloudAgentFqdn(), scope.GetAuthorizer()),
+		Scope:           scope,
 	}
 }

cloud/services/virtualmachines/virtualmachines.go

@@ -53,24 +53,43 @@ type Spec struct {
 	OSDisk     infrav1.OSDisk
 	CustomData string
 	VMType     compute.VMType
+	HostType   infrav1.HostType
 }
 
 // Get provides information about a virtual machine.
 func (s *Service) Get(ctx context.Context, spec interface{}) (interface{}, error) {
+	var err error
 	vmSpec, ok := spec.(*Spec)
 	if !ok {
-		return compute.VirtualMachine{}, errors.New("invalid vm specification")
+		return nil, errors.New("invalid vm specification")
 	}
 
-	vm, err := s.Client.Get(ctx, s.Scope.GetResourceGroup(), vmSpec.Name)
-	if err != nil {
-		return nil, err
-	}
-	if vm == nil || len(*vm) == 0 {
-		return nil, errors.Wrapf(err, "vm %s not found", vmSpec.Name)
-	}
+	switch vmSpec.HostType {
+	case infrav1.HostTypeBareMetal:
+		var baremetalmachine *[]compute.BareMetalMachine
+
+		baremetalmachine, err = s.BareMetalClient.Get(ctx, s.Scope.GetResourceGroup(), vmSpec.Name)
+		if err != nil {
+			return nil, err
+		}
+
+		if baremetalmachine == nil || len(*baremetalmachine) == 0 {
+			return nil, errors.Errorf("bare-metal machine %s not found", vmSpec.Name)
+		}
+
+		return converters.BareMetalMachineConvertToCAPH((*baremetalmachine)[0])
 
-	return converters.SDKToVM((*vm)[0])
+	default:
+		vm, err := s.VMClient.Get(ctx, s.Scope.GetResourceGroup(), vmSpec.Name)
+		if err != nil {
+			return nil, err
+		}
+		if vm == nil || len(*vm) == 0 {
+			return nil, errors.Errorf("vm %s not found", vmSpec.Name)
+		}
+
+		return converters.VMConvertToCAPH((*vm)[0])
+	}
 }
 
 // Reconcile gets/creates/updates a virtual machine.
@@ -173,36 +192,91 @@ func (s *Service) Reconcile(ctx context.Context, spec interface{}) error {
 		}
 	}
 
-	_, err = s.Client.CreateOrUpdate(
-		ctx,
-		s.Scope.GetResourceGroup(),
-		vmSpec.Name,
-		&virtualMachine)
-	if err != nil {
-		return errors.Wrapf(err, "cannot create vm")
-	}
+	switch vmSpec.HostType {
+	case infrav1.HostTypeBareMetal:
+		_, err := s.createOrUpdateBareMetal(
+			ctx,
+			&virtualMachine)
+		if err != nil {
+			return errors.Wrapf(err, "cannot create bare-metal machine")
+		}
 
+	default:
+		_, err = s.VMClient.CreateOrUpdate(
+			ctx,
+			s.Scope.GetResourceGroup(),
+			vmSpec.Name,
+			&virtualMachine)
+		if err != nil {
+			return errors.Wrapf(err, "cannot create vm")
+		}
+	}
 	klog.V(2).Infof("successfully created vm %s ", vmSpec.Name)
 	return err
 }
 
+func (s *Service) createOrUpdateBareMetal(ctx context.Context, virtualMachine *compute.VirtualMachine) (*compute.BareMetalMachine, error) {
+	// Create a new baremetal machine
+	bareMetalMachine := &compute.BareMetalMachine{
+		Name: virtualMachine.Name,
+	}
+
+	bareMetalMachine.BareMetalMachineProperties = &compute.BareMetalMachineProperties{
+		StorageProfile: &compute.BareMetalMachineStorageProfile{
+			ImageReference: &compute.BareMetalMachineImageReference{
+				ID:   virtualMachine.VirtualMachineProperties.StorageProfile.ImageReference.ID,
+				Name: virtualMachine.VirtualMachineProperties.StorageProfile.ImageReference.Name,
+			},
+		},
+		OsProfile: &compute.BareMetalMachineOSProfile{
+			ComputerName:       virtualMachine.VirtualMachineProperties.OsProfile.ComputerName,
+			AdminUsername:      virtualMachine.VirtualMachineProperties.OsProfile.AdminUsername,
+			AdminPassword:      virtualMachine.VirtualMachineProperties.OsProfile.AdminPassword,
+			CustomData:         virtualMachine.VirtualMachineProperties.OsProfile.CustomData,
+			LinuxConfiguration: virtualMachine.VirtualMachineProperties.OsProfile.LinuxConfiguration,
+		},
+		SecurityProfile:   virtualMachine.VirtualMachineProperties.SecurityProfile,
+		ProvisioningState: virtualMachine.VirtualMachineProperties.ProvisioningState,
+		Statuses:          virtualMachine.VirtualMachineProperties.Statuses,
+	}
+
+	// Try to apply the update.
+	_, err := s.BareMetalClient.CreateOrUpdate(ctx, s.Scope.GetResourceGroup(), *bareMetalMachine.Name, bareMetalMachine)
+
+	if err != nil {
+		return nil, errors.Wrap(err, "Failed to create baremetal machine.")
+	}
+
+	klog.V(2).Infof("Successfully created baremetal machine %s ", bareMetalMachine.Name)
+	return bareMetalMachine, nil
+}
+
 // Delete deletes the virtual machine with the provided name.
 func (s *Service) Delete(ctx context.Context, spec interface{}) error {
 	vmSpec, ok := spec.(*Spec)
 	if !ok {
 		return errors.New("invalid vm Specification")
 	}
-	klog.V(2).Infof("deleting vm %s ", vmSpec.Name)
-	err := s.Client.Delete(ctx, s.Scope.GetResourceGroup(), vmSpec.Name)
+
+	var err error
+	switch vmSpec.HostType {
+	case infrav1.HostTypeBareMetal:
+		klog.V(2).Infof("deleting bare-metal machine %s ", vmSpec.Name)
+		err = s.BareMetalClient.Delete(ctx, s.Scope.GetResourceGroup(), vmSpec.Name)
+	default:
+		klog.V(2).Infof("deleting vm %s ", vmSpec.Name)
+		err = s.VMClient.Delete(ctx, s.Scope.GetResourceGroup(), vmSpec.Name)
+	}
+
 	if err != nil && azurestackhci.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.GetResourceGroup())
+		return errors.Wrapf(err, "failed to delete %s %s in resource group %s", vmSpec.HostType, vmSpec.Name, s.Scope.GetResourceGroup())
 	}
 
-	klog.V(2).Infof("successfully deleted vm %s ", vmSpec.Name)
+	klog.V(2).Infof("successfully deleted %s %s ", vmSpec.HostType, vmSpec.Name)
 	return err
 }