Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions pkg/cloud/azure/services/virtualmachines/virtualmachines.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ func (s *Service) deriveVirtualMachineParameters(vmSpec *Spec, nicID string) (*a
return nil, fmt.Errorf("failed to get Spot VM options %w", err)
}

dataDisks, err := generateDataDisks(vmSpec)
dataDisks, err := generateDataDisks(vmSpec, false)
if err != nil {
return nil, fmt.Errorf("failed to generate data disk spec: %w", err)
}
Expand Down Expand Up @@ -540,7 +540,7 @@ func generateSecurityProfile(vmSpec *Spec, osDisk *armcompute.OSDisk) (*armcompu
return securityProfile, nil
}

func generateDataDisks(vmSpec *Spec) ([]*armcompute.DataDisk, error) {
func generateDataDisks(vmSpec *Spec, isStackHub bool) ([]*armcompute.DataDisk, error) {
seenDataDiskLuns := make(map[int32]struct{})
seenDataDiskNames := make(map[string]struct{})
// defines rules for matching. strings must start and finish with an alphanumeric character
Expand Down Expand Up @@ -605,6 +605,22 @@ func generateDataDisks(vmSpec *Spec) ([]*armcompute.DataDisk, error) {
dataDiskName, vmSpec.Name, disk.DeletionPolicy, machinev1.DiskDeletionPolicyTypeDelete, machinev1.DiskDeletionPolicyTypeDetach)
}

if isStackHub {
// DeletionPolicy must be set to `Detach` on Azure Stack Hub. This is the implicit behavior and only valid option.
if disk.DeletionPolicy != machinev1.DiskDeletionPolicyTypeDetach {
return nil, apierrors.InvalidMachineConfiguration("failed to create Data Disk: %s for vm %s. "+
"`deletionPolicy` unsupported value %s. Supported value is `Detach` on Azure Stack Hub.",
dataDiskName, vmSpec.Name, disk.DeletionPolicy)
}

// DiskEncryptionSet is not supported on Azure Stack Hub
if disk.ManagedDisk.DiskEncryptionSet != nil {
return nil, apierrors.InvalidMachineConfiguration("failed to create Data Disk: %s for vm %s. "+
"`diskEncryptionSet` is not supported by Azure Stack Hub.",
dataDiskName, vmSpec.Name)
}
}

seenDataDiskNames[disk.NameSuffix] = struct{}{}
seenDataDiskLuns[disk.Lun] = struct{}{}

Expand All @@ -614,7 +630,11 @@ func generateDataDisks(vmSpec *Spec) ([]*armcompute.DataDisk, error) {
Lun: to.Int32Ptr(disk.Lun),
Name: to.StringPtr(dataDiskName),
Caching: ptr.To(armcompute.CachingTypes(disk.CachingType)),
DeleteOption: ptr.To(armcompute.DiskDeleteOptionTypes(disk.DeletionPolicy)),
}

// DeleteOption not supported on Azure Stack Hub, the implicit behavior is to detach the disk (disk remains after VM deletion)
if !isStackHub {
dataDisks[i].DeleteOption = ptr.To(armcompute.DiskDeleteOptionTypes(disk.DeletionPolicy))
}

dataDisks[i].ManagedDisk = &armcompute.ManagedDiskParameters{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ func (s *Service) deriveVirtualMachineParametersStackHub(vmSpec *Spec, nicID str
}
}

dataDisks, err := generateDataDisks(vmSpec, true)
if err != nil {
return nil, fmt.Errorf("failed to generate data disk spec: %w", err)
}

virtualMachine := &compute.VirtualMachine{
Location: ptr.To(s.Scope.MachineConfig.Location),
Tags: vmSpec.Tags,
Expand All @@ -62,6 +67,7 @@ func (s *Service) deriveVirtualMachineParametersStackHub(vmSpec *Spec, nicID str
StorageAccountType: ptr.To(compute.StorageAccountTypes(vmSpec.OSDisk.ManagedDisk.StorageAccountType)),
},
},
DataDisks: dataDisks,
},
OSProfile: osProfile,
NetworkProfile: &compute.NetworkProfile{
Expand Down