Skip to content

Commit 498573b

Browse files
authored
neonvm-controller: Use virtio-mem when status.memoryProvider is nil (#1110)
Part of #1060. Before we stop setting status.memoryProvider, we need to make sure that an empty status.memoryProvider is interpreted as virtio-mem. We *could* do that everywhere status.memoryProvider is used, but it's probably just easier to do it at top, replacing our handling that originally set DIMM slots by default.
1 parent 4244690 commit 498573b

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

pkg/neonvm/controllers/vm_controller.go

+8-4
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,15 @@ func (r *VMReconciler) doReconcile(ctx context.Context, vm *vmv1.VirtualMachine)
328328
vm.Status.SSHSecretName = fmt.Sprintf("ssh-neonvm-%s", vm.Name)
329329
}
330330

331-
// Set memory provider for old VMs that don't have it in the Status.
331+
// Forwards compatibility: Set virtio-mem memory provider for VMs that don't have it in the
332+
// status.
333+
// We need to do this so that when we switch to no longer setting memoryProvider, we won't
334+
// regress and try to set it to dimm slots.
335+
// See #1060 for the relevant tracking issue.
332336
if vm.Status.PodName != "" && vm.Status.MemoryProvider == nil {
333-
oldMemProvider := vmv1.MemoryProviderDIMMSlots
334-
log.Error(nil, "Setting default MemoryProvider for VM", "MemoryProvider", oldMemProvider)
335-
vm.Status.MemoryProvider = lo.ToPtr(oldMemProvider)
337+
newMemProvider := vmv1.MemoryProviderVirtioMem
338+
log.Error(nil, "Setting default MemoryProvider for VM", "MemoryProvider", newMemProvider)
339+
vm.Status.MemoryProvider = lo.ToPtr(newMemProvider)
336340
}
337341

338342
switch vm.Status.Phase {

0 commit comments

Comments
 (0)