Skip to content

fix(vm): clarify missing default VirtualMachineClass error #2534

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

Open
eofff wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(vm): clarify missing default VirtualMachineClass error #2534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions images/virtualization-artifact/pkg/controller/vm/internal/defaulter/defaulters_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ var _ = Describe("Set default class in virtualMachineClasName", func() {
})

Context("creating VM with empty virtualMachineClassName", func() {
It("should keep virtualMachineClassName empty if no default class", func() {
It("should return a clear error if no default class", func() {
// Initialize fake client with some classes.
name := "single-custom-class"
setup(
Expand All @@ -107,7 +107,7 @@ var _ = Describe("Set default class in virtualMachineClasName", func() {

vm := newVMWithEmptyClass("vm-with-empty-class")
err := classDefaulter.Default(ctx, vm)
Expect(err).Should(BeNil())
Expect(err).Should(MatchError(ContainSubstring("spec.virtualMachineClassName is empty and no default VirtualMachineClass is configured")))
Expect(vm.Spec.VirtualMachineClassName).Should(BeEmpty())
})

Expand Down
5 changes: 2 additions & 3 deletions ...irtualization-artifact/pkg/controller/vm/internal/defaulter/virtual_machine_class_name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
"github.com/deckhouse/virtualization-controller/pkg/controller/service"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
)
Expand Down Expand Up @@ -56,10 +57,8 @@ func (v *VirtualMachineClassNameDefaulter) Default(ctx context.Context, vm *v1al
return err
}

// "No default class" is not a mutating error, validators will complain
// about missing field during validation phase later.
if defaultClass == nil {
return nil
return fmt.Errorf("spec.virtualMachineClassName is empty and no default VirtualMachineClass is configured; set spec.virtualMachineClassName explicitly or mark one VirtualMachineClass as default with the %q annotation set to %q", annotations.AnnVirtualMachineClassDefault, "true")
}

vm.Spec.VirtualMachineClassName = defaultClass.GetName()
Expand Down
Loading