Skip to content

Commit c9ab890

Browse files
committed
chore: Refactor InstanceGuestAcceleratorsSpec to be a standalone function
This will enable reuse in the upcoming MachinePool support.
1 parent 5f2aa05 commit c9ab890

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

cloud/scope/machine.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,12 +379,12 @@ func (m *MachineScope) InstanceAdditionalMetadataSpec() *compute.Metadata {
379379
}
380380

381381
// InstanceGuestAcceleratorsSpec returns a slice of Guest Accelerator Config specs.
382-
func (m *MachineScope) InstanceGuestAcceleratorsSpec() []*compute.AcceleratorConfig {
383-
if len(m.GCPMachine.Spec.GuestAccelerators) == 0 {
382+
func InstanceGuestAcceleratorsSpec(guestAccelerators []infrav1.Accelerator) []*compute.AcceleratorConfig {
383+
if len(guestAccelerators) == 0 {
384384
return nil
385385
}
386-
accelConfigs := make([]*compute.AcceleratorConfig, 0, len(m.GCPMachine.Spec.GuestAccelerators))
387-
for _, accel := range m.GCPMachine.Spec.GuestAccelerators {
386+
accelConfigs := make([]*compute.AcceleratorConfig, 0, len(guestAccelerators))
387+
for _, accel := range guestAccelerators {
388388
accelConfig := &compute.AcceleratorConfig{
389389
AcceleratorType: accel.Type,
390390
AcceleratorCount: accel.Count,
@@ -488,7 +488,7 @@ func (m *MachineScope) InstanceSpec(log logr.Logger) *compute.Instance {
488488
instance.Metadata = m.InstanceAdditionalMetadataSpec()
489489
instance.ServiceAccounts = append(instance.ServiceAccounts, m.InstanceServiceAccountsSpec())
490490
instance.NetworkInterfaces = append(instance.NetworkInterfaces, m.InstanceNetworkInterfaceSpec())
491-
instance.GuestAccelerators = m.InstanceGuestAcceleratorsSpec()
491+
instance.GuestAccelerators = InstanceGuestAcceleratorsSpec(m.GCPMachine.Spec.GuestAccelerators)
492492
if len(instance.GuestAccelerators) > 0 {
493493
instance.Scheduling.OnHostMaintenance = "TERMINATE"
494494
}

0 commit comments

Comments
 (0)