fix(webhooks): use correct network name format

Signed-off-by: Frank Yang <poan.yang@suse.com>
ahnan4arch · Oct 6, 2021 · c4a7670 · c4a7670
1 parent a452886
commit c4a7670
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pkg/webhook/resources/network/validator.go b/pkg/webhook/resources/network/validator.go
@@ -121,11 +121,19 @@ func (v *networkAttachmentDefinitionValidator) getVLAN(namespace string, vid int
 
 func (v *networkAttachmentDefinitionValidator) Delete(request *types.Request, oldObj runtime.Object) error {
 	netAttachDef := oldObj.(*v1.NetworkAttachmentDefinition)
-	networkName := netAttachDef.Name
+
+	// multus network name can be <networkName> or <namespace>/<networkName>
+	// ref: https://github.com/kubevirt/client-go/blob/148fa0d1c7e83b7a56606a7ca92394ba6768c9ac/api/v1/schema.go#L1436-L1439
+	networkName := fmt.Sprintf("%s/%s", netAttachDef.Namespace, netAttachDef.Name)
 	vms, err := v.vms.GetByIndex(indexeres.VMByNetworkIndex, networkName)
 	if err != nil {
 		return err
 	}
+	if vmsTmp, err := v.vms.GetByIndex(indexeres.VMByNetworkIndex, netAttachDef.Name); err != nil {
+		return err
+	} else {
+		vms = append(vms, vmsTmp...)
+	}
 
 	if len(vms) > 0 {
 		vmNameList := make([]string, 0, len(vms))