feat(api): add new controllers vmmac and vmmaclease

LopatinDmitr · LopatinDmitr · commit 86b57d7e723f · 2025-08-25T17:55:49.000+03:00
Signed-off-by: Dmitry Lopatin &lt;dmitry.lopatin@flant.com&gt;
diff --git a/api/core/v1alpha2/virtual_machine.go b/api/core/v1alpha2/virtual_machine.go
@@ -261,8 +261,9 @@ const (
 )
 
 type NetworksSpec struct {
-	Type string `json:"type"`
-	Name string `json:"name"`
+	Type                         string `json:"type"`
+	Name                         string `json:"name,omitempty"`
+	VirtualMachineMACAddressName string `json:"virtualMachineMACAddressName,omitempty"`
 }
 
 const (
@@ -422,9 +423,9 @@ type Versions struct {
 
 type NetworksStatus struct {
 	Type                         string `json:"type"`
-	Name                         string `json:"name"`
-	MAC                          string `json:"macAddress"`
-	VirtualMachineMACAddressName string `json:"virtualMachineMACAddressName"`
+	Name                         string `json:"name,omitempty"`
+	MAC                          string `json:"macAddress,omitempty"`
+	VirtualMachineMACAddressName string `json:"virtualMachineMACAddressName,omitempty"`
 }
 
 // MachinePhase defines current phase of the virtual machine:
diff --git a/api/core/v1alpha2/vmcondition/condition.go b/api/core/v1alpha2/vmcondition/condition.go
@@ -44,7 +44,7 @@ const (
 	TypeFirmwareUpToDate Type = "FirmwareUpToDate"
 	// TypeNeedsEvict indicates that the VirtualMachine should be evicting from node.
 	TypeNeedsEvict Type = "NeedsEvict"
-
+	// TypeNetworkReady indicates the state of additional network interfaces inside the virtual machine pod
 	TypeNetworkReady Type = "NetworkReady"
 )
 
@@ -126,7 +126,10 @@ const (
 	// ReasonNeedsEvict indicates that the VirtualMachine should be evicting from node.
 	ReasonNeedsEvict Reason = "NeedsEvict"
 
-	ReasonNetworkReady     Reason = "NetworkReady"
-	ReasonNetworkNotReady  Reason = "NetworkNotReady"
+	// ReasonNetworkReady indicates that the additional network interfaces in the virtual machine pod are ready.
+	ReasonNetworkReady Reason = "NetworkReady"
+	// ReasonNetworkNotReady indicates that the additional network interfaces in the virtual machine pod are not ready.
+	ReasonNetworkNotReady Reason = "NetworkNotReady"
+	// ReasonSDNModuleDisable indicates that the SDN module is disabled, which may prevent network interfaces from becoming ready.
 	ReasonSDNModuleDisable Reason = "SDNModuleDisable"
 )
diff --git a/crds/doc-ru-virtualmachinemacaddresses.yaml b/crds/doc-ru-virtualmachinemacaddresses.yaml
@@ -4,15 +4,15 @@ spec:
       schema:
         openAPIV3Schema:
           description: |
-            Ресурс, определяющий MAC-адрес для виртуальной машины.
+            Ресурс предназначен для генерации MAC-адреса из заданного диапазона и его последующего назначения сетевому интерфейсу виртуальной машины.
           properties:
             spec:
               description: |
                 Настройки `VirtualMachineMACAddress`.
               properties:
                 address:
                   description: |
-                    Запрашиваемый MAC-адрес, который должен быть присвоен виртуальной машине. Если поле пустое, назначается случайный адрес.
+                    Запрашиваемый MAC-адрес, который должен быть присвоен сетевому интерфейсу виртуальной машине. Если поле пустое, назначается случайный адрес из заданного диапазона адресов.
             status:
               properties:
                 conditions:
diff --git a/crds/doc-ru-virtualmachinemacaddressleases.yaml b/crds/doc-ru-virtualmachinemacaddressleases.yaml
@@ -4,7 +4,7 @@ spec:
       schema:
         openAPIV3Schema:
           description: |
-            Ресурс, определяющий факт выданной аренды для `VirtualMachineMACAddress`.
+            Ресурс обеспечивает резервирование MAC-адреса для сетевого интерфейса виртуальной машины, фиксируя факт его аллокации в объекте `VirtualMachineMACAddress` и предотвращая повторное выделение.
           properties:
             spec:
               description: |
diff --git a/crds/doc-ru-virtualmachines.yaml b/crds/doc-ru-virtualmachines.yaml
@@ -558,6 +558,10 @@ spec:
                       name:
                         description: |
                           Имя сетевого интерфейса.
+                      virtualMachineMACAddressName:
+                        type: string
+                        description: |
+                          Имя ресурса `VirtualMachineMACAddress`, связанного с сетевым интерфейсом.
             status:
               properties:
                 blockDeviceRefs:
diff --git a/crds/virtualmachinemacaddresses.yaml b/crds/virtualmachinemacaddresses.yaml
@@ -23,7 +23,7 @@ spec:
       schema:
         openAPIV3Schema:
           description: |
-            The resource that defines MAC address for virtual machine.
+            The requested MAC address to be assigned to the virtual machine's network interface. If the field is empty, a random address from the specified address range is assigned.
           properties:
             apiVersion:
               type: string
@@ -37,7 +37,7 @@ spec:
               properties:
                 address:
                   description: |
-                    The requested MAC address that should be assigned to the virtual machine. Random address is assigned if empty.
+                    The requested MAC address to be assigned to the virtual machine's network interface. If the field is empty, a random address from the specified address range is assigned.
                   type: string
               type: object
             status:
diff --git a/crds/virtualmachinemacaddressleases.yaml b/crds/virtualmachinemacaddressleases.yaml
@@ -24,7 +24,7 @@ spec:
       schema:
         openAPIV3Schema:
           description: |
-            The resource that defines fact of issued lease for `VirtualMachineMACAddress`.
+            The resource reserves a MAC address for a virtual machine's network interface, recording its allocation in the `VirtualMachineMACAddress` object and preventing it from being assigned again.
           properties:
             apiVersion:
               type: string
diff --git a/crds/virtualmachines.yaml b/crds/virtualmachines.yaml
@@ -976,6 +976,10 @@ spec:
                         type: string
                         description: |
                           The name of the network interface.
+                      virtualMachineMACAddressName:
+                        type: string
+                        description: |
+                          The name of the `VirtualMachineMACAddress` resource that is associated with the network interface.
             status:
               type: object
               properties:
diff --git a/images/virtualization-artifact/cmd/virtualization-controller/main.go b/images/virtualization-artifact/cmd/virtualization-controller/main.go
@@ -133,9 +133,6 @@ func main() {
 	var virtControllerName string
 	pflag.StringVar(&virtControllerName, "virt-controller-name", getEnv(VirtControllerNameEnv, "virt-controller"), "Virt controller name")
 
-	var clusterUUID string
-	pflag.StringVar(&clusterUUID, "cluster-uuid", getEnv(clusterUUIDEnv, ""), "Cluster UUID")
-
 	var leaderElection bool
 	pflag.BoolVar(&leaderElection, "leader-election", true, "Leader election")
 
diff --git a/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go b/images/virtualization-artifact/pkg/controller/kvbuilder/kvvm_utils.go
@@ -262,13 +262,11 @@ func setNetwork(kvvm *KVVM, networkSpec network.InterfaceSpecList) {
 }
 
 func setNetworksAnnotation(kvvm *KVVM, networkSpec network.InterfaceSpecList) error {
-	if len(networkSpec) > 1 {
-		networkConfig := networkSpec
-		networkConfigStr, err := networkConfig.ToString()
-		if err != nil {
-			return err
-		}
-		kvvm.SetKVVMIAnnotation(annotations.AnnNetworksSpec, networkConfigStr)
+	networkConfig := networkSpec
+	networkConfigStr, err := networkConfig.ToString()
+	if err != nil {
+		return err
 	}
+	kvvm.SetKVVMIAnnotation(annotations.AnnNetworksSpec, networkConfigStr)
 	return nil
 }
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/mac.go b/images/virtualization-artifact/pkg/controller/vm/internal/mac.go
@@ -92,17 +92,21 @@ func (h *MACHandler) Handle(ctx context.Context, s state.VirtualMachineState) (r
 	if err != nil {
 		return reconcile.Result{}, err
 	}
-
 	if len(vmmacs) < expectedMACAddresses {
+		createdCount := 0
 		if kvvm != nil && len(vmmacs) == 0 {
 			for _, iface := range kvvm.Spec.Template.Spec.Domain.Devices.Interfaces {
-				err = h.macManager.CreateMACAddress(ctx, vm, h.client, iface.MacAddress)
-				if err != nil {
-					return reconcile.Result{}, err
+				if strings.HasPrefix(iface.Name, "veth_") {
+					err = h.macManager.CreateMACAddress(ctx, vm, h.client, iface.MacAddress)
+					createdCount++
+					if err != nil {
+						return reconcile.Result{}, err
+					}
 				}
 			}
-		} else {
-			macsToCreate := expectedMACAddresses - len(vmmacs)
+		}
+		if createdCount < expectedMACAddresses {
+			macsToCreate := countNetworksWithMACRequest(vm.Spec.Networks, vmmacs) - createdCount
 			for i := 0; i < macsToCreate; i++ {
 				err = h.macManager.CreateMACAddress(ctx, vm, h.client, "")
 				if err != nil {
@@ -163,3 +167,25 @@ func (h *MACHandler) Handle(ctx context.Context, s state.VirtualMachineState) (r
 func (h *MACHandler) Name() string {
 	return nameMACHandler
 }
+
+func countNetworksWithMACRequest(networkSpec []virtv2.NetworksSpec, vmmacs []*virtv2.VirtualMachineMACAddress) int {
+	existingMACNames := make(map[string]bool)
+	for _, vmmac := range vmmacs {
+		existingMACNames[vmmac.Name] = true
+	}
+
+	count := 0
+	for _, ns := range networkSpec {
+		if ns.Type != virtv2.NetworksTypeMain {
+			continue
+		}
+
+		if ns.VirtualMachineMACAddressName == "" {
+			count++
+		} else if !existingMACNames[ns.VirtualMachineMACAddressName] {
+			count++
+		}
+	}
+
+	return count
+}
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/network.go b/images/virtualization-artifact/pkg/controller/vm/internal/network.go
@@ -25,6 +25,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/component-base/featuregate"
+	virtv1 "kubevirt.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
@@ -72,45 +73,53 @@ func (h *NetworkInterfaceHandler) Handle(ctx context.Context, s state.VirtualMac
 		return reconcile.Result{}, nil
 	}
 
-	if len(vm.Spec.Networks) == 1 {
-		vm.Status.Networks = []virtv2.NetworksStatus{
-			{
-				Type: virtv2.NetworksTypeMain,
-			},
+	if len(vm.Spec.Networks) > 1 {
+		if !h.featureGate.Enabled(featuregates.SDN) {
+			cb.Status(metav1.ConditionFalse).Reason(vmcondition.ReasonSDNModuleDisable).Message("For additional network interfaces, please enable SDN module")
+			return reconcile.Result{}, nil
 		}
-		return reconcile.Result{}, nil
-	}
 
-	if !h.featureGate.Enabled(featuregates.SDN) {
-		cb.Status(metav1.ConditionFalse).Reason(vmcondition.ReasonSDNModuleDisable).Message("For additional network interfaces, please enable SDN module")
-		return reconcile.Result{}, nil
-	}
+		pods, err := s.Pods(ctx)
+		if err != nil {
+			return reconcile.Result{}, err
+		}
 
-	pods, err := s.Pods(ctx)
-	if err != nil {
-		return reconcile.Result{}, err
-	}
+		errMsg, err := extractNetworkStatusFromPods(pods)
+		if err != nil {
+			return reconcile.Result{}, err
+		}
 
-	errMsg, err := extractNetworkStatusFromPods(pods)
-	if err != nil {
-		return reconcile.Result{}, err
+		if errMsg != "" {
+			cb.Status(metav1.ConditionFalse).Reason(vmcondition.ReasonNetworkNotReady).Message(errMsg)
+		} else {
+			cb.Status(metav1.ConditionTrue).Reason(vmcondition.ReasonNetworkReady).Message("")
+		}
 	}
 
-	if errMsg != "" {
-		cb.Status(metav1.ConditionFalse).Reason(vmcondition.ReasonNetworkNotReady).Message(errMsg)
-	} else {
-		cb.Status(metav1.ConditionTrue).Reason(vmcondition.ReasonNetworkReady).Message("")
+	return h.UpdateNetworkStatus(ctx, s, vm)
+}
+
+func (h *NetworkInterfaceHandler) Name() string {
+	return nameNetworkHandler
+}
+
+func (h *NetworkInterfaceHandler) UpdateNetworkStatus(ctx context.Context, s state.VirtualMachineState, vm *virtv2.VirtualMachine) (reconcile.Result, error) {
+	// check that vmmacName is not removed when deleting a network interface from the spec, as it is still in use
+	if len(vm.Status.Networks) > len(vm.Spec.Networks) {
+		if vm.Status.Phase != virtv2.MachinePending && vm.Status.Phase != virtv2.MachineStopped {
+			return reconcile.Result{}, nil
+		}
 	}
 
-	kvvmi, err := s.KVVMI(ctx)
+	kvvm, err := s.KVVM(ctx)
 	if err != nil {
 		return reconcile.Result{}, err
 	}
 
 	macAddressesByInterfaceName := make(map[string]string)
-	if kvvmi != nil {
-		for _, i := range kvvmi.Status.Interfaces {
-			macAddressesByInterfaceName[i.Name] = i.MAC
+	if kvvm != nil && kvvm.Status.PrintableStatus != virtv1.VirtualMachineStatusUnschedulable {
+		for _, i := range kvvm.Spec.Template.Spec.Domain.Devices.Interfaces {
+			macAddressesByInterfaceName[i.Name] = i.MacAddress
 		}
 	}
 
@@ -121,33 +130,31 @@ func (h *NetworkInterfaceHandler) Handle(ctx context.Context, s state.VirtualMac
 
 	vmmacNamesByAddress := make(map[string]string)
 	for _, vmmac := range vmmacs {
-		vmmacNamesByAddress[vmmac.Status.Address] = vmmac.Name
+		if mac := vmmac.Status.Address; mac != "" {
+			vmmacNamesByAddress[vmmac.Status.Address] = vmmac.Name
+		}
 	}
 
 	networksStatus := []virtv2.NetworksStatus{
 		{
 			Type: virtv2.NetworksTypeMain,
+			Name: "default",
 		},
 	}
 
 	for _, interfaceSpec := range network.CreateNetworkSpec(vm, vmmacs) {
-		macAddress := macAddressesByInterfaceName[interfaceSpec.InterfaceName]
 		networksStatus = append(networksStatus, virtv2.NetworksStatus{
 			Type:                         interfaceSpec.Type,
 			Name:                         interfaceSpec.Name,
-			MAC:                          macAddress,
-			VirtualMachineMACAddressName: vmmacNamesByAddress[macAddress],
+			MAC:                          macAddressesByInterfaceName[interfaceSpec.InterfaceName],
+			VirtualMachineMACAddressName: vmmacNamesByAddress[interfaceSpec.MAC],
 		})
 	}
 
 	vm.Status.Networks = networksStatus
 	return reconcile.Result{}, nil
 }
 
-func (h *NetworkInterfaceHandler) Name() string {
-	return nameNetworkHandler
-}
-
 func extractNetworkStatusFromPods(pods *corev1.PodList) (string, error) {
 	var errorMessages []string
 
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/state/state.go b/images/virtualization-artifact/pkg/controller/vm/internal/state/state.go
@@ -336,6 +336,18 @@ func (s *state) VirtualMachineMACAddresses(ctx context.Context) ([]*virtv2.Virtu
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
+	var vmmacs []*virtv2.VirtualMachineMACAddress
+	for _, ns := range s.vm.Current().Spec.Networks {
+		vmmacKey := types.NamespacedName{Name: ns.VirtualMachineMACAddressName, Namespace: s.vm.Current().GetNamespace()}
+		vmmac, err := object.FetchObject(ctx, vmmacKey, s.client, &virtv2.VirtualMachineMACAddress{})
+		if err != nil {
+			return nil, fmt.Errorf("failed to fetch VirtualMachineMACAddress: %w", err)
+		}
+		if vmmac != nil {
+			vmmacs = append(vmmacs, vmmac)
+		}
+	}
+
 	vmmacList := &virtv2.VirtualMachineMACAddressList{}
 	err := s.client.List(ctx, vmmacList, &client.ListOptions{
 		Namespace:     s.vm.Current().GetNamespace(),
@@ -345,11 +357,6 @@ func (s *state) VirtualMachineMACAddresses(ctx context.Context) ([]*virtv2.Virtu
 		return nil, fmt.Errorf("failed to list VirtualMachineMACAddress: %w", err)
 	}
 
-	if len(vmmacList.Items) == 0 {
-		return nil, nil
-	}
-
-	var vmmacs []*virtv2.VirtualMachineMACAddress
 	for _, vmmac := range vmmacList.Items {
 		vmmacs = append(vmmacs, &vmmac)
 	}
diff --git a/images/virtualization-artifact/pkg/controller/vm/internal/watcher/vmmac_watcher.go b/images/virtualization-artifact/pkg/controller/vm/internal/watcher/vmmac_watcher.go
@@ -29,6 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
+	"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
 	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
@@ -45,6 +46,15 @@ func (w *VMMACWatcher) Watch(mgr manager.Manager, ctr controller.Controller) err
 			&virtv2.VirtualMachineMACAddress{},
 			handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, vmmac *virtv2.VirtualMachineMACAddress) []reconcile.Request {
 				name := vmmac.Status.VirtualMachine
+				if name == "" {
+					for _, ownerRef := range vmmac.OwnerReferences {
+						if ownerRef.Kind == virtv2.VirtualMachineKind && string(ownerRef.UID) == vmmac.Labels[annotations.LabelVirtualMachineUID] {
+							name = ownerRef.Name
+							break
+						}
+					}
+				}
+
 				if name == "" {
 					return nil
 				}
diff --git a/images/virtualization-artifact/pkg/controller/vmmac/internal/attached_handler.go b/images/virtualization-artifact/pkg/controller/vmmac/internal/attached_handler.go
diff --git a/images/virtualization-artifact/pkg/controller/vmmac/internal/watcher/vm_watcher.go b/images/virtualization-artifact/pkg/controller/vmmac/internal/watcher/vm_watcher.go
diff --git a/images/virtualization-artifact/pkg/controller/vmmaclease/internal/lifecycle_handler.go b/images/virtualization-artifact/pkg/controller/vmmaclease/internal/lifecycle_handler.go
diff --git a/images/virtualization-artifact/pkg/controller/vmmaclease/vmmaclease_controller.go b/images/virtualization-artifact/pkg/controller/vmmaclease/vmmaclease_controller.go

Original file line number	Diff line number	Diff line change
`@@ -262,13 +262,11 @@ func setNetwork(kvvm *KVVM, networkSpec network.InterfaceSpecList) {`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`func setNetworksAnnotation(kvvm *KVVM, networkSpec network.InterfaceSpecList) error {`
`265`		`- if len(networkSpec) > 1 {`
`266`		`- networkConfig := networkSpec`
`267`		`- networkConfigStr, err := networkConfig.ToString()`
`268`		`- if err != nil {`
`269`		`- return err`
`270`		`- }`
`271`		`- kvvm.SetKVVMIAnnotation(annotations.AnnNetworksSpec, networkConfigStr)`
	`265`	`+ networkConfig := networkSpec`
	`266`	`+ networkConfigStr, err := networkConfig.ToString()`
	`267`	`+ if err != nil {`
	`268`	`+ return err`
`272`	`269`	`}`
	`270`	`+ kvvm.SetKVVMIAnnotation(annotations.AnnNetworksSpec, networkConfigStr)`
`273`	`271`	`return nil`
`274`	`272`	`}`