Make Type of VM Explicit

svalabs · Sep 17, 2024 · 41b009e · 41b009e
1 parent 86c0e6d
commit 41b009e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/v3/pkg/apis/hobbyfarm.io/v1/types.go b/v3/pkg/apis/hobbyfarm.io/v1/types.go
@@ -32,7 +32,6 @@ type VirtualMachineList struct {
 	Items           []VirtualMachine `json:"items"`
 }
 
-// Todo isSharedVM Enum?
 type VirtualMachineSpec struct {
 	VirtualMachineTemplateId string             `json:"vm_template_id"`
 	SshUsername              string             `json:"ssh_username"`

diff --git a/v3/services/scheduledeventsvc/internal/controller.go b/v3/services/scheduledeventsvc/internal/controller.go
@@ -563,7 +563,7 @@ func (sc *ScheduledEventController) taintSharedVMs(se *scheduledeventpb.Schedule
 func (sc *ScheduledEventController) createSharedVMs(se *scheduledeventpb.ScheduledEvent) error {
 	for i := 0; i < len(se.GetSharedVms()); i++ {
 		sharedVM := se.GetSharedVms()[i]
-		// if sharedVM are provision (have VMId) continue, if new(empty VMId) create VM
+		// if sharedVM is provisioned (VMId is set) continue, if new sharedVM (empty VMId) we create the VM
 		if sharedVM.GetVmId() != "" {
 			continue
 		}

diff --git a/v3/services/vmclaimsvc/internal/controller.go b/v3/services/vmclaimsvc/internal/controller.go
@@ -271,6 +271,7 @@ func (v *VMClaimController) submitVirtualMachines(vmc *vmclaimpb.VMClaim) (err e
 			VmClaimUid:   vmc.GetUid(),
 			User:         vmc.GetUserId(),
 			Provision:    true,
+			VmType:       vmpb.VirtualMachineType_USER,
 			Labels: map[string]string{
 				"dynamic":                       "true",
 				"vmc":                           vmc.GetId(),

diff --git a/v3/services/vmsetsvc/internal/controller.go b/v3/services/vmsetsvc/internal/controller.go
@@ -182,6 +182,7 @@ func (v *VMSetController) reconcileVirtualMachineSet(vmset *vmsetpb.VMSet) error
 				Provision:    provision,
 				VmSetId:      vmset.GetId(),
 				VmSetUid:     vmset.GetUid(),
+				VmType:       vmpb.VirtualMachineType_USER,
 				Labels:       vmLabels,
 				Finalizers:   []string{vmSetFinalizer},
 			})