Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix templateless vm clean #436

Merged
merged 2 commits into from
Sep 9, 2024
Merged

Fix templateless vm clean #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
341194a
Revert "pool-manager: Prevent panic if VM template is nil (#431)"
RamLavi Sep 8, 2024
2ed7946
vm, webhook: Fix panic on templateless VM
RamLavi Sep 8, 2024
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
30 changes: 0 additions & 30 deletions pkg/pool-manager/pool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,16 +357,6 @@ var _ = Describe("Pool", func() {
updateTransactionTimestamp := func(secondsPassed time.Duration) time.Time {
return time.Now().Add(secondsPassed * time.Second)
}
It("should not allocate if VM template is nil", func() {
poolManager := createPoolManager("02:00:00:00:00:00", "02:00:00:00:00:02")
newInvalidVM := multipleInterfacesVM.DeepCopy()
newInvalidVM.Name = "newVM"
newInvalidVM.Spec.Template = nil

transactionTimestamp := updateTransactionTimestamp(0)
err := poolManager.AllocateVirtualMachineMac(newInvalidVM, &transactionTimestamp, true, logger)
Expect(err).ToNot(HaveOccurred())
})
It("should reject allocation if there are interfaces with the same name", func() {
poolManager := createPoolManager("02:00:00:00:00:00", "02:00:00:00:00:02")
newVM := duplicateInterfacesVM.DeepCopy()
Expand Down Expand Up @@ -429,26 +419,6 @@ var _ = Describe("Pool", func() {
})
})
Describe("Update vm object", func() {
It("should not allocate if VM template is nil", func() {
poolManager := createPoolManager("02:00:00:00:00:00", "02:00:00:00:00:02")
newVM := multipleInterfacesVM.DeepCopy()
newVM.Name = "newVM"

transactionTimestamp := updateTransactionTimestamp(0)
err := poolManager.AllocateVirtualMachineMac(newVM, &transactionTimestamp, true, logger)
Expect(err).ToNot(HaveOccurred())

updateVm := multipleInterfacesVM.DeepCopy()
newInvalidVM := newVM.DeepCopy()
newInvalidVM.Spec.Template = nil
err = poolManager.UpdateMacAddressesForVirtualMachine(newInvalidVM, updateVm, &transactionTimestamp, true, logger)
Expect(err).ToNot(HaveOccurred())

updateInvalidVm := multipleInterfacesVM.DeepCopy()
updateInvalidVm.Spec.Template = nil
err = poolManager.UpdateMacAddressesForVirtualMachine(newVM, updateInvalidVm, &transactionTimestamp, true, logger)
Expect(err).ToNot(HaveOccurred())
})
It("should preserve disk.io configuration on update", func() {
addDiskIO := func(vm *kubevirt.VirtualMachine, ioName kubevirt.DriverIO) {
vm.Spec.Template.Spec.Domain.Devices.Disks = make([]kubevirt.Disk, 1)
Expand Down
13 changes: 0 additions & 13 deletions pkg/pool-manager/virtualmachine_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ func (p *PoolManager) AllocateVirtualMachineMac(virtualMachine *kubevirt.Virtual
defer p.poolMutex.Unlock()
logger := parentLogger.WithName("AllocateVirtualMachineMac")

if virtualMachine.Spec.Template == nil {
logger.Info("virtual machine template is nil, skipping mac allocation", "virtualMachine", virtualMachine)
return nil
}
if len(virtualMachine.Spec.Template.Spec.Domain.Devices.Interfaces) == 0 {
logger.Info("no interfaces found for virtual machine, skipping mac allocation", "virtualMachine", virtualMachine)
return nil
Expand Down Expand Up @@ -137,15 +133,6 @@ func (p *PoolManager) UpdateMacAddressesForVirtualMachine(previousVirtualMachine
}
defer p.poolMutex.Unlock()

if previousVirtualMachine.Spec.Template == nil {
logger.Info("virtual machine template is nil, skipping mac allocation", "virtualMachine", virtualMachine)
return nil
}
if virtualMachine.Spec.Template == nil {
logger.Info("virtual machine template is nil, skipping mac allocation", "virtualMachine", virtualMachine)
return nil
}

// We can't allow for duplicate interfaces names, as interface.Name is macMap's key.
if isNotDryRun {
if err := checkVmForInterfaceDuplication(virtualMachine); err != nil {
Expand Down
6 changes: 6 additions & 0 deletions pkg/webhook/virtualmachine/virtualmachine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ func (a *virtualMachineAnnotator) Handle(ctx context.Context, req admission.Requ

logger.V(1).Info("got a virtual machine event")

if virtualMachine.Spec.Template == nil {
const errMsg = "virtual machine template is nil, ignoring virtual machine"
logger.Info(errMsg)
return admission.Allowed(errMsg)
}

isNotDryRun := (req.DryRun == nil || *req.DryRun == false)
if req.AdmissionRequest.Operation == admissionv1.Create {
err = a.mutateCreateVirtualMachinesFn(virtualMachine, isNotDryRun, logger)
Expand Down
Loading