-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(vmclass): add vmclass size policies cpu cross validation
Signed-off-by: Valeriy Khorunzhin <valeriy.khorunzhin@flant.com>
- Loading branch information
Valeriy Khorunzhin
committed
Sep 5, 2024
1 parent
f9be344
commit 8631cea
Showing
5 changed files
with
293 additions
and
0 deletions.
There are no files selected for viewing
80 changes: 80 additions & 0 deletions
80
...lization-artifact/pkg/controller/vmclass/internal/validators/sizing_policies_validator.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/* | ||
Copyright 2024 Flant JSC | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package validators | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
|
||
"sigs.k8s.io/controller-runtime/pkg/client" | ||
"sigs.k8s.io/controller-runtime/pkg/webhook/admission" | ||
|
||
"github.com/deckhouse/virtualization/api/core/v1alpha2" | ||
) | ||
|
||
type SizingPoliciesValidator struct { | ||
client client.Client | ||
} | ||
|
||
func NewSizingPoliciesValidator(client client.Client) *SizingPoliciesValidator { | ||
return &SizingPoliciesValidator{client: client} | ||
} | ||
|
||
func (v *SizingPoliciesValidator) ValidateCreate(_ context.Context, vmclass *v1alpha2.VirtualMachineClass) (admission.Warnings, error) { | ||
if HasCpuSizePoliciesCrosses(&vmclass.Spec) { | ||
return nil, fmt.Errorf("vmclass %s has size policy cpu crosses", vmclass.Name) | ||
} | ||
|
||
return nil, nil | ||
} | ||
|
||
func (v *SizingPoliciesValidator) ValidateUpdate(_ context.Context, _, newVMClass *v1alpha2.VirtualMachineClass) (admission.Warnings, error) { | ||
if HasCpuSizePoliciesCrosses(&newVMClass.Spec) { | ||
return nil, fmt.Errorf("vmclass %s has size policy cpu crosses", newVMClass.Name) | ||
} | ||
|
||
return nil, nil | ||
} | ||
|
||
func HasCpuSizePoliciesCrosses(vmclass *v1alpha2.VirtualMachineClassSpec) bool { | ||
usedPairs := make(map[[2]int]bool) | ||
|
||
for i, policy1 := range vmclass.SizingPolicies { | ||
for j, policy2 := range vmclass.SizingPolicies { | ||
if i == j { | ||
continue | ||
} | ||
_, ok := usedPairs[[2]int{i, j}] | ||
if ok { | ||
continue | ||
} | ||
|
||
if policy1.Cores.Min >= policy2.Cores.Min && policy1.Cores.Min <= policy2.Cores.Max { | ||
return true | ||
} | ||
|
||
if policy1.Cores.Max >= policy2.Cores.Min && policy1.Cores.Max <= policy2.Cores.Max { | ||
return true | ||
} | ||
|
||
usedPairs[[2]int{i, j}] = true | ||
usedPairs[[2]int{j, i}] = true | ||
} | ||
} | ||
|
||
return false | ||
} |
92 changes: 92 additions & 0 deletions
92
...rtualization-artifact/pkg/controller/vmclass/internal/validators/validators_suite_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
package validators_test | ||
|
||
import ( | ||
"testing" | ||
|
||
. "github.com/onsi/ginkgo/v2" | ||
. "github.com/onsi/gomega" | ||
|
||
. "github.com/deckhouse/virtualization-controller/pkg/controller/vmclass/internal/validators" | ||
"github.com/deckhouse/virtualization/api/core/v1alpha2" | ||
) | ||
|
||
func TestValidators(t *testing.T) { | ||
RegisterFailHandler(Fail) | ||
RunSpecs(t, "Validators Suite") | ||
} | ||
|
||
var _ = Describe("Spec policies validator", func() { | ||
var vmclass v1alpha2.VirtualMachineClass | ||
|
||
Context("empty vmclass", func() { | ||
BeforeEach(func() { | ||
vmclass = v1alpha2.VirtualMachineClass{} | ||
}) | ||
|
||
It("Should return no problem when empty value", func() { | ||
Expect(HasCpuSizePoliciesCrosses(&vmclass.Spec)).Should(BeFalse()) | ||
}) | ||
}) | ||
|
||
Context("vmclass with no cpu size policies crosses", func() { | ||
BeforeEach(func() { | ||
vmclass = v1alpha2.VirtualMachineClass{} | ||
vmclass.Spec.SizingPolicies = append(vmclass.Spec.SizingPolicies, v1alpha2.SizingPolicy{ | ||
Cores: &v1alpha2.SizingPolicyCores{ | ||
Min: 1, | ||
Max: 4, | ||
Step: 1, | ||
}, | ||
}) | ||
vmclass.Spec.SizingPolicies = append(vmclass.Spec.SizingPolicies, v1alpha2.SizingPolicy{ | ||
Cores: &v1alpha2.SizingPolicyCores{ | ||
Min: 5, | ||
Max: 9, | ||
Step: 1, | ||
}, | ||
}) | ||
vmclass.Spec.SizingPolicies = append(vmclass.Spec.SizingPolicies, v1alpha2.SizingPolicy{ | ||
Cores: &v1alpha2.SizingPolicyCores{ | ||
Min: 10, | ||
Max: 15, | ||
Step: 1, | ||
}, | ||
}) | ||
}) | ||
|
||
It("Should return no problem with correct values", func() { | ||
Expect(HasCpuSizePoliciesCrosses(&vmclass.Spec)).Should(BeFalse()) | ||
}) | ||
}) | ||
|
||
Context("vmclass with cpu size policies crosses", func() { | ||
BeforeEach(func() { | ||
vmclass = v1alpha2.VirtualMachineClass{} | ||
vmclass.Spec.SizingPolicies = append(vmclass.Spec.SizingPolicies, v1alpha2.SizingPolicy{ | ||
Cores: &v1alpha2.SizingPolicyCores{ | ||
Min: 1, | ||
Max: 4, | ||
Step: 1, | ||
}, | ||
}) | ||
vmclass.Spec.SizingPolicies = append(vmclass.Spec.SizingPolicies, v1alpha2.SizingPolicy{ | ||
Cores: &v1alpha2.SizingPolicyCores{ | ||
Min: 4, | ||
Max: 9, | ||
Step: 1, | ||
}, | ||
}) | ||
vmclass.Spec.SizingPolicies = append(vmclass.Spec.SizingPolicies, v1alpha2.SizingPolicy{ | ||
Cores: &v1alpha2.SizingPolicyCores{ | ||
Min: 10, | ||
Max: 15, | ||
Step: 1, | ||
}, | ||
}) | ||
}) | ||
|
||
It("Should return problem with incorrect values", func() { | ||
Expect(HasCpuSizePoliciesCrosses(&vmclass.Spec)).Should(BeTrue()) | ||
}) | ||
}) | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
images/virtualization-artifact/pkg/controller/vmclass/vmclass_webhook.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
/* | ||
Copyright 2024 Flant JSC | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package vmclass | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"log/slog" | ||
|
||
"k8s.io/apimachinery/pkg/runtime" | ||
"sigs.k8s.io/controller-runtime/pkg/client" | ||
"sigs.k8s.io/controller-runtime/pkg/webhook/admission" | ||
|
||
"github.com/deckhouse/virtualization-controller/pkg/controller/vmclass/internal/validators" | ||
virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2" | ||
) | ||
|
||
type VirtualMachineClassValidator interface { | ||
ValidateCreate(ctx context.Context, vm *virtv2.VirtualMachineClass) (admission.Warnings, error) | ||
ValidateUpdate(ctx context.Context, oldVM, newVM *virtv2.VirtualMachineClass) (admission.Warnings, error) | ||
} | ||
|
||
type Validator struct { | ||
validators []VirtualMachineClassValidator | ||
log *slog.Logger | ||
} | ||
|
||
func NewValidator(client client.Client, log *slog.Logger) *Validator { | ||
return &Validator{ | ||
validators: []VirtualMachineClassValidator{ | ||
validators.NewSizingPoliciesValidator(client), | ||
}, | ||
log: log.With("webhook", "validation"), | ||
} | ||
} | ||
|
||
func (v *Validator) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) { | ||
vmclass, ok := obj.(*virtv2.VirtualMachineClass) | ||
if !ok { | ||
return nil, fmt.Errorf("expected a new VirtualMachine but got a %T", obj) | ||
} | ||
|
||
var warnings admission.Warnings | ||
|
||
for _, validator := range v.validators { | ||
warn, err := validator.ValidateCreate(ctx, vmclass) | ||
if err != nil { | ||
return nil, err | ||
} | ||
warnings = append(warnings, warn...) | ||
} | ||
|
||
return warnings, nil | ||
} | ||
|
||
func (v *Validator) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) { | ||
oldVMClass, ok := oldObj.(*virtv2.VirtualMachineClass) | ||
if !ok { | ||
return nil, fmt.Errorf("expected an old VirtualMachineClass but got a %T", oldObj) | ||
} | ||
|
||
newVMClass, ok := newObj.(*virtv2.VirtualMachineClass) | ||
if !ok { | ||
return nil, fmt.Errorf("expected a new VirtualMachineClass but got a %T", newObj) | ||
} | ||
|
||
var warnings admission.Warnings | ||
|
||
for _, validator := range v.validators { | ||
warn, err := validator.ValidateUpdate(ctx, oldVMClass, newVMClass) | ||
if err != nil { | ||
return nil, err | ||
} | ||
warnings = append(warnings, warn...) | ||
} | ||
|
||
return warnings, nil | ||
} | ||
|
||
func (v *Validator) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) { | ||
err := fmt.Errorf("misconfigured webhook rules: delete operation not implemented") | ||
v.log.Error("Ensure the correctness of ValidatingWebhookConfiguration", "err", err.Error()) | ||
return nil, nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters