-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
virt-api, admitter: Move out slirp binding validation
Relocate the slirp admitter validations to the network/admitter package. Simplify the implementation and provide clear unit tests to the various checks. Signed-off-by: Edward Haas <edwardh@redhat.com>
- Loading branch information
Showing
5 changed files
with
174 additions
and
61 deletions.
There are no files selected for viewing
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
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,58 @@ | ||
| /* | ||
| * This file is part of the KubeVirt project | ||
| * | ||
| * 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. | ||
| * | ||
| * Copyright 2024 Red Hat, Inc. | ||
| * | ||
| */ | ||
|
|
||
| package admitter | ||
|
|
||
| import ( | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| k8sfield "k8s.io/apimachinery/pkg/util/validation/field" | ||
|
|
||
| "kubevirt.io/kubevirt/pkg/network/vmispec" | ||
|
|
||
| virtconfig "kubevirt.io/kubevirt/pkg/virt-config" | ||
|
|
||
| v1 "kubevirt.io/api/core/v1" | ||
| ) | ||
|
|
||
| func ValidateSlirpBinding(field *k8sfield.Path, spec *v1.VirtualMachineInstanceSpec, config *virtconfig.ClusterConfig) (causes []metav1.StatusCause) { | ||
| for idx, ifaceSpec := range spec.Domain.Devices.Interfaces { | ||
| if ifaceSpec.Slirp == nil { | ||
| continue | ||
| } | ||
| net := vmispec.LookupNetworkByName(spec.Networks, ifaceSpec.Name) | ||
| if net == nil { | ||
| continue | ||
| } | ||
|
|
||
| if net.Pod == nil { | ||
| causes = append(causes, metav1.StatusCause{ | ||
| Type: metav1.CauseTypeFieldValueInvalid, | ||
| Message: "Slirp interface only implemented with pod network", | ||
| Field: field.Child("domain", "devices", "interfaces").Index(idx).Child("name").String(), | ||
| }) | ||
| } else if !config.IsSlirpInterfaceEnabled() { | ||
| causes = append(causes, metav1.StatusCause{ | ||
| Type: metav1.CauseTypeFieldValueInvalid, | ||
| Message: "Slirp interface is not enabled in kubevirt-config", | ||
| Field: field.Child("domain", "devices", "interfaces").Index(idx).Child("name").String(), | ||
| }) | ||
| } | ||
| } | ||
| return causes | ||
| } |
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,107 @@ | ||
| /* | ||
| * This file is part of the KubeVirt project | ||
| * | ||
| * 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. | ||
| * | ||
| * Copyright 2024 Red Hat, Inc. | ||
| * | ||
| */ | ||
|
|
||
| package admitter_test | ||
|
|
||
| import ( | ||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
|
|
||
| k8sfield "k8s.io/apimachinery/pkg/util/validation/field" | ||
|
|
||
| v1 "kubevirt.io/api/core/v1" | ||
|
|
||
| "kubevirt.io/kubevirt/pkg/pointer" | ||
| "kubevirt.io/kubevirt/pkg/testutils" | ||
| virtconfig "kubevirt.io/kubevirt/pkg/virt-config" | ||
|
|
||
| "kubevirt.io/kubevirt/pkg/network/admitter" | ||
| ) | ||
|
|
||
| var _ = Describe("Validate interface with SLIRP binding", func() { | ||
| It("should be rejected if not enabled in the Kubevirt CR", func() { | ||
| vmi := v1.VirtualMachineInstance{} | ||
| vmi.Spec.Domain.Devices.Interfaces = []v1.Interface{{ | ||
| Name: "default", | ||
| InterfaceBindingMethod: v1.InterfaceBindingMethod{ | ||
| Slirp: &v1.InterfaceSlirp{}, | ||
| }, | ||
| }} | ||
| vmi.Spec.Networks = []v1.Network{{ | ||
| Name: "default", | ||
| NetworkSource: v1.NetworkSource{Pod: &v1.PodNetwork{}}, | ||
| }} | ||
|
|
||
| config, _, _ := testutils.NewFakeClusterConfigUsingKV(&v1.KubeVirt{}) | ||
|
|
||
| causes := admitter.ValidateSlirpBinding(k8sfield.NewPath("fake"), &vmi.Spec, config) | ||
| Expect(causes).To(HaveLen(1)) | ||
| Expect(causes[0].Message).To(Equal("Slirp interface is not enabled in kubevirt-config")) | ||
| }) | ||
|
|
||
| When("SLIRP is enabled in Kubevirt CR", func() { | ||
| var ( | ||
| kv v1.KubeVirt | ||
| config *virtconfig.ClusterConfig | ||
| ) | ||
|
|
||
| BeforeEach(func() { | ||
| kv.Spec.Configuration.NetworkConfiguration = &v1.NetworkConfiguration{ | ||
| PermitSlirpInterface: pointer.P(true), | ||
| } | ||
| c, _, kvInformer := testutils.NewFakeClusterConfigUsingKV(&kv) | ||
| testutils.UpdateFakeKubeVirtClusterConfig(kvInformer, &kv) | ||
| config = c | ||
| }) | ||
|
|
||
| It("should be rejected without a pod network", func() { | ||
| vmi := v1.VirtualMachineInstance{} | ||
| vmi.Spec.Domain.Devices.Interfaces = []v1.Interface{{ | ||
| Name: "default", | ||
| InterfaceBindingMethod: v1.InterfaceBindingMethod{ | ||
| Slirp: &v1.InterfaceSlirp{}, | ||
| }, | ||
| }} | ||
| vmi.Spec.Networks = []v1.Network{{ | ||
| Name: "default", | ||
| NetworkSource: v1.NetworkSource{Multus: &v1.MultusNetwork{}}, | ||
| }} | ||
|
|
||
| causes := admitter.ValidateSlirpBinding(k8sfield.NewPath("fake"), &vmi.Spec, config) | ||
| Expect(causes).To(HaveLen(1)) | ||
| Expect(causes[0].Message).To(Equal("Slirp interface only implemented with pod network")) | ||
| }) | ||
|
|
||
| It("should be accepted with a pod network", func() { | ||
| vmi := v1.VirtualMachineInstance{} | ||
| vmi.Spec.Domain.Devices.Interfaces = []v1.Interface{{ | ||
| Name: "default", | ||
| InterfaceBindingMethod: v1.InterfaceBindingMethod{ | ||
| Slirp: &v1.InterfaceSlirp{}, | ||
| }, | ||
| }} | ||
| vmi.Spec.Networks = []v1.Network{{ | ||
| Name: "default", | ||
| NetworkSource: v1.NetworkSource{Pod: &v1.PodNetwork{}}, | ||
| }} | ||
|
|
||
| Expect(admitter.ValidateSlirpBinding(k8sfield.NewPath("fake"), &vmi.Spec, config)).To(BeEmpty()) | ||
| }) | ||
| }) | ||
| }) |
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
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