feat(api): add new controllers vmmac and vmmaclease

LopatinDmitr · LopatinDmitr · commit cc03b22bc9c4 · 2025-08-18T17:42:26.000+03:00
Signed-off-by: Dmitry Lopatin &lt;dmitry.lopatin@flant.com&gt;
diff --git a/api/core/v1alpha2/finalizers.go b/api/core/v1alpha2/finalizers.go
@@ -32,11 +32,11 @@ const (
 	FinalizerVICleanup              = "virtualization.deckhouse.io/vi-cleanup"
 	FinalizerVMCleanup              = "virtualization.deckhouse.io/vm-cleanup"
 	FinalizerIPAddressCleanup       = "virtualization.deckhouse.io/vmip-cleanup"
-	FinalizerMACAddressCleanup      = "virtualization.deckhouse.io/vmmac-cleanup"
 	FinalizerIPAddressLeaseCleanup  = "virtualization.deckhouse.io/vmipl-cleanup"
-	FinalizerMACAddressLeaseCleanup = "virtualization.deckhouse.io/vmmacl-cleanup"
 	FinalizerVDSnapshotCleanup      = "virtualization.deckhouse.io/vdsnapshot-cleanup"
 	FinalizerVMOPCleanup            = "virtualization.deckhouse.io/vmop-cleanup"
 	FinalizerVMClassCleanup         = "virtualization.deckhouse.io/vmclass-cleanup"
 	FinalizerVMBDACleanup           = "virtualization.deckhouse.io/vmbda-cleanup"
+	FinalizerMACAddressCleanup      = "virtualization.deckhouse.io/vmmac-cleanup"
+	FinalizerMACAddressLeaseCleanup = "virtualization.deckhouse.io/vmmacl-cleanup"
 )
diff --git a/api/core/v1alpha2/virtual_machine.go b/api/core/v1alpha2/virtual_machine.go
@@ -281,7 +281,8 @@ type VirtualMachineStatus struct {
 	// Name of `virtualMachineIPAddressName` holding the ip address of the VirtualMachine.
 	VirtualMachineIPAddress string `json:"virtualMachineIPAddressName"`
 	// IP address of VM.
-	IPAddress       string                                   `json:"ipAddress"`
+	IPAddress string `json:"ipAddress"`
+	// The list of attached block device attachments.
 	BlockDeviceRefs []BlockDeviceStatusRef                   `json:"blockDeviceRefs,omitempty"`
 	GuestOSInfo     virtv1.VirtualMachineInstanceGuestOSInfo `json:"guestOSInfo,omitempty"`
 	// Detailed state of the virtual machine lifecycle.
diff --git a/api/core/v1alpha2/virtual_machine_mac_address.go b/api/core/v1alpha2/virtual_machine_mac_address.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 Flant JSC
+Copyright 2025 Flant JSC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/api/core/v1alpha2/virtual_machine_mac_address_lease.go b/api/core/v1alpha2/virtual_machine_mac_address_lease.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 Flant JSC
+Copyright 2025 Flant JSC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/api/core/v1alpha2/vmmaccondition/condition.go b/api/core/v1alpha2/vmmaccondition/condition.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 Flant JSC
+Copyright 2025 Flant JSC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -47,9 +47,6 @@ func (r AttachedReason) String() string {
 }
 
 const (
-	// VirtualMachineMACAddressIsOutOfTheValidRange is a BoundReason indicating when specified MAC address is out of the range in controller settings.
-	VirtualMachineMACAddressIsOutOfTheValidRange BoundReason = "VirtualMachineMACAddressIsOutOfTheValidRange"
-
 	// VirtualMachineMACAddressLeaseAlreadyExists is a BoundReason indicating the MAC address lease already exists.
 	VirtualMachineMACAddressLeaseAlreadyExists BoundReason = "VirtualMachineMACAddressLeaseAlreadyExists"
 
diff --git a/api/core/v1alpha2/vmmaclcondition/condition.go b/api/core/v1alpha2/vmmaclcondition/condition.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 Flant JSC
+Copyright 2025 Flant JSC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package vmmaclcondition
 type Type string
 
 const (
-	// BoundType represents the condition type when a Virtual Machine MAC is bound.
+	// BoundType represents the condition type when a Virtual Machine MAC lease is bound.
 	BoundType Type = "Bound"
 )
 
@@ -37,7 +37,4 @@ func (r BoundReason) String() string {
 const (
 	// Bound is a BoundReason indicating the MAC address lease is successfully bound.
 	Bound BoundReason = "Bound"
-
-	// NotBound is a BoundReason indicating the MAC address lease is not bound.
-	NotBound BoundReason = "NotBound"
 )
diff --git a/images/virtualization-artifact/pkg/common/network/network.go b/images/virtualization-artifact/pkg/common/network/network.go
@@ -36,6 +36,7 @@ type InterfaceSpec struct {
 	Type          string `json:"type"`
 	Name          string `json:"name"`
 	InterfaceName string `json:"ifName"`
+	MAC           string `json:"-"`
 }
 
 type InterfaceStatus struct {
@@ -73,6 +74,7 @@ func CreateNetworkSpec(vmSpec virtv2.VirtualMachineSpec, vmmacs []*virtv2.Virtua
 			Type:          network.Type,
 			Name:          network.Name,
 			InterfaceName: generateInterfaceName(macAddresses[macCounter], network.Type),
+			MAC:           macAddresses[macCounter],
 		})
 
 		macCounter++
diff --git a/images/virtualization-artifact/pkg/controller/indexer/vmmac_indexer.go b/images/virtualization-artifact/pkg/controller/indexer/vmmac_indexer.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 Flant JSC
+Copyright 2025 Flant JSC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/images/virtualization-artifact/pkg/controller/indexer/vmmaclease_indexer.go b/images/virtualization-artifact/pkg/controller/indexer/vmmaclease_indexer.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 Flant JSC
+Copyright 2025 Flant JSC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go
@@ -20,7 +20,6 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"fmt"
-	"sort"
 	"strings"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -92,7 +91,6 @@ func ApplyVirtualMachineSpec(
 	class *virtv2.VirtualMachineClass,
 	ipAddress string,
 	networkSpec network.InterfaceSpecList,
-	vmmacs []*virtv2.VirtualMachineMACAddress,
 ) error {
 	if err := kvvm.SetRunPolicy(vm.Spec.RunPolicy); err != nil {
 		return err
@@ -108,7 +106,7 @@ func ApplyVirtualMachineSpec(
 	}
 
 	kvvm.SetMetadata(vm.ObjectMeta)
-	setNetwork(kvvm, networkSpec, vmmacs)
+	setNetwork(kvvm, networkSpec)
 	kvvm.SetTablet("default-0")
 	kvvm.SetNodeSelector(vm.Spec.NodeSelector, class.Spec.NodeSelector.MatchLabels)
 	kvvm.SetTolerations(vm.Spec.Tolerations, class.Spec.Tolerations)
@@ -254,23 +252,12 @@ func ApplyVirtualMachineSpec(
 	return nil
 }
 
-func setNetwork(kvvm *KVVM, networkSpec network.InterfaceSpecList, vmmacs []*virtv2.VirtualMachineMACAddress) {
+func setNetwork(kvvm *KVVM, networkSpec network.InterfaceSpecList) {
 	kvvm.ClearNetworkInterfaces()
 	kvvm.SetNetworkInterface(network.NameDefaultInterface, "")
 
-	sort.Slice(vmmacs, func(i, j int) bool {
-		return vmmacs[i].CreationTimestamp.Before(&vmmacs[j].CreationTimestamp)
-	})
-
-	var macAddresses []string
-	for _, vmmac := range vmmacs {
-		if vmmac != nil && vmmac.Status.Address != "" {
-			macAddresses = append(macAddresses, vmmac.Status.Address)
-		}
-	}
-
-	for i, n := range networkSpec {
-		kvvm.SetNetworkInterface(n.InterfaceName, macAddresses[i])
+	for _, n := range networkSpec {
+		kvvm.SetNetworkInterface(n.InterfaceName, n.MAC)
 	}
 }
 
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/network.go b/images/virtualization-artifact/pkg/controller/vm/internal/network.go
@@ -124,7 +124,6 @@ func (h *NetworkInterfaceHandler) Handle(ctx context.Context, s state.VirtualMac
 		vmmacNamesByAddress[vmmac.Status.Address] = vmmac.Name
 	}
 
-	// todo
 	networksStatus := []virtv2.NetworksStatus{
 		{
 			Type: virtv2.NetworksTypeMain,
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/network_test.go b/images/virtualization-artifact/pkg/controller/vm/internal/network_test.go
@@ -71,6 +71,7 @@ var _ = Describe("NetworkInterfaceHandler", func() {
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      name,
 				Namespace: namespace,
+				UID:       "test-uid",
 			},
 			Spec:   virtv2.VirtualMachineSpec{},
 			Status: virtv2.VirtualMachineStatus{},
@@ -85,6 +86,32 @@ var _ = Describe("NetworkInterfaceHandler", func() {
 		vmPod = nil
 	})
 
+	newMACAddress := func(name, address string, phase virtv2.VirtualMachineMACAddressPhase, attachedVM string) *virtv2.VirtualMachineMACAddress {
+		mac := &virtv2.VirtualMachineMACAddress{
+			TypeMeta: metav1.TypeMeta{
+				Kind:       "VirtualMachineMACAddress",
+				APIVersion: "virtualization.deckhouse.io/v1alpha2",
+			},
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      name,
+				Namespace: namespace,
+				Labels: map[string]string{
+					annotations.LabelVirtualMachineUID: string(vm.UID),
+				},
+			},
+			Status: virtv2.VirtualMachineMACAddressStatus{
+				Address: address,
+			},
+		}
+		if phase != "" {
+			mac.Status.Phase = phase
+		}
+		if attachedVM != "" {
+			mac.Status.VirtualMachine = attachedVM
+		}
+		return mac
+	}
+
 	reconcile := func() {
 		gate, _, setFromMap, err := featuregates.New()
 		Expect(err).NotTo(HaveOccurred())
@@ -140,6 +167,7 @@ var _ = Describe("NetworkInterfaceHandler", func() {
 
 		Describe("NetworkSpec have many interfaces", func() {
 			It("Network status is not exist; Condition should have status 'False'", func() {
+				mac1 := newMACAddress("test-mac-address1", "aa:bb:cc:dd:ee:ff", virtv2.VirtualMachineMACAddressPhaseAttached, name)
 				networkSpec := []virtv2.NetworksSpec{
 					{
 						Type: virtv2.NetworksTypeMain,
@@ -150,7 +178,7 @@ var _ = Describe("NetworkInterfaceHandler", func() {
 					},
 				}
 				vm.Spec.Networks = networkSpec
-				fakeClient, resource, vmState = setupEnvironment(vm, vmPod)
+				fakeClient, resource, vmState = setupEnvironment(vm, vmPod, mac1)
 				reconcile()
 
 				newVM := &virtv2.VirtualMachine{}
@@ -165,6 +193,7 @@ var _ = Describe("NetworkInterfaceHandler", func() {
 			})
 
 			It("Network status is exist; Condition should have status 'True'", func() {
+				mac1 := newMACAddress("test-mac-address1", "aa:bb:cc:dd:ee:ff", virtv2.VirtualMachineMACAddressPhaseAttached, name)
 				networkSpec := []virtv2.NetworksSpec{
 					{
 						Type: virtv2.NetworksTypeMain,
@@ -177,29 +206,6 @@ var _ = Describe("NetworkInterfaceHandler", func() {
 				vm.Spec.Networks = networkSpec
 				vmPod.Annotations[annotations.AnnNetworksStatus] = `
 				[
-					{
-					  "type": "Main",
-					  "name": "default",
-					  "ifName": "default",
-					  "mac": "aa:bb:cc:dd:ee:ff",
-					  "ipAddress": "10.2.3.4",
-					  "conditions": [
-						{
-						  "message": "",
-						  "reason": "InterfaceConfiguredSuccessfully",
-						  "status": "True",
-						  "type": "Configured",
-						  "lastTransitionTime": "2025-06-02T13:03:13Z"
-						},
-						{
-						  "message": "",
-						  "reason": "Up",
-						  "status": "True",
-						  "type": "Negotiated",
-						  "lastTransitionTime": "2025-06-02T13:03:13Z"
-						}
-					  ]
-					},
 					{
 					  "type": "Network",
 					  "name": "test-network",
@@ -223,7 +229,7 @@ var _ = Describe("NetworkInterfaceHandler", func() {
 					  ]
 					}
 				]`
-				fakeClient, resource, vmState = setupEnvironment(vm, vmPod)
+				fakeClient, resource, vmState = setupEnvironment(vm, vmPod, mac1)
 				reconcile()
 
 				newVM := &virtv2.VirtualMachine{}
@@ -238,6 +244,7 @@ var _ = Describe("NetworkInterfaceHandler", func() {
 			})
 
 			It("Network status is exist; Condition should have status 'False'", func() {
+				mac1 := newMACAddress("test-mac-address1", "aa:bb:cc:dd:ee:ff", virtv2.VirtualMachineMACAddressPhaseAttached, name)
 				networkSpec := []virtv2.NetworksSpec{
 					{
 						Type: virtv2.NetworksTypeMain,
@@ -250,29 +257,6 @@ var _ = Describe("NetworkInterfaceHandler", func() {
 				vm.Spec.Networks = networkSpec
 				vmPod.Annotations[annotations.AnnNetworksStatus] = `
 				[
-					{
-					  "type": "Main",
-					  "name": "default",
-					  "ifName": "default",
-					  "mac": "aa:bb:cc:dd:ee:ff",
-					  "ipAddress": "10.2.3.4",
-					  "conditions": [
-						{
-						  "message": "message with configuration error",
-						  "reason": "ConfigurationError",
-						  "status": "False",
-						  "type": "Configured",
-						  "lastTransitionTime": "2025-06-02T13:03:13Z"
-						},
-						{
-						  "message": "message with negotiation error",
-						  "reason": "NoCarrier",
-						  "status": "False",
-						  "type": "Negotiated",
-						  "lastTransitionTime": "2025-06-02T13:03:13Z"
-						}
-					  ]
-					},
 					{
 					  "type": "Network",
 					  "name": "test-network",
@@ -297,7 +281,7 @@ var _ = Describe("NetworkInterfaceHandler", func() {
 					  ]
 					}
 				]`
-				fakeClient, resource, vmState = setupEnvironment(vm, vmPod)
+				fakeClient, resource, vmState = setupEnvironment(vm, vmPod, mac1)
 				reconcile()
 
 				newVM := &virtv2.VirtualMachine{}
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/sync_kvvm.go b/images/virtualization-artifact/pkg/controller/vm/internal/sync_kvvm.go
@@ -391,7 +391,7 @@ func (h *SyncKvvmHandler) makeKVVMFromVMSpec(ctx context.Context, s state.Virtua
 	networkSpec := network.CreateNetworkSpec(current.Spec, vmmacs)
 
 	// Create kubevirt VirtualMachine resource from d8 VirtualMachine spec.
-	err = kvbuilder.ApplyVirtualMachineSpec(kvvmBuilder, current, bdState.VDByName, bdState.VIByName, bdState.CVIByName, class, ip.Status.Address, networkSpec, vmmacs)
+	err = kvbuilder.ApplyVirtualMachineSpec(kvvmBuilder, current, bdState.VDByName, bdState.VIByName, bdState.CVIByName, class, ip.Status.Address, networkSpec)
 	if err != nil {
 		return nil, err
 	}
