Introduce watch and cleanup of NICs

Signed-off-by: Lukas Frank <lukas.frank@sap.com>

Author: lukasfrank

cmd/libvirt-provider/app/app.go

@@ -286,8 +286,7 @@ func Run(ctx context.Context, opts Options) error {
 	}
 
 	setupLog.Info("Initializing network interface plugin")
-
-	if err := nicPlugin.Init(providerHost); err != nil {
+	if err := nicPlugin.Init(ctx, providerHost); err != nil {
 		setupLog.Error(err, "failed to initialize network plugin")
 		return err
 	}

internal/controllers/controllers_suite_test.go

@@ -184,7 +184,7 @@ var _ = BeforeSuite(func() {
 	if cleanup != nil {
 		DeferCleanup(cleanup)
 	}
-	Expect(networkPlugin.Init(providerHost)).To(Succeed())
+	Expect(networkPlugin.Init(pluginCtx, providerHost)).To(Succeed())
 
 	By("setting up resource claimer")
 	resClaimer, err = claim.NewResourceClaimer(

internal/controllers/machine_controller.go

@@ -173,6 +173,13 @@ func (r *MachineReconciler) Start(ctx context.Context) error {
 		},
 	})
 
+	r.networkInterfacePlugin.AddEventHandler(providernetworkinterface.EventHandlerFuncs{
+		HandleNICEventFunc: func(machineID string) {
+			log.V(1).Info("NIC event: Requeue machine", "Machine", machineID)
+			r.queue.Add(machineID)
+		},
+	})
+
 	imgEventReg, err := r.machineEvents.AddHandler(event.HandlerFunc[*api.Machine](func(evt event.Event[*api.Machine]) {
 		r.queue.Add(evt.Object.ID)
 	}))

internal/controllers/machine_controller_nics.go

@@ -164,21 +164,28 @@ func (r *MachineReconciler) attachDetachNetworkInterfaces(
 		mountedNic, err := r.reconcileDesiredNetworkInterface(ctx, machine, domain, mountedNics, desiredNic)
 		if err != nil {
 			errs = append(errs, fmt.Errorf("[network interface %s] error reconciling: %w", nicName, err))
-		} else {
-			log.V(1).Info("Successfully reconciled desired network interface", "NetworkInterfaceName", nicName)
-			mountedNics[nicName] = *mountedNic
-			nicStates = append(nicStates, api.NetworkInterfaceStatus{
-				Name:   nicName,
-				Handle: mountedNic.networkInterface.Handle,
-				State:  api.NetworkInterfaceStateAttached,
-			})
+			continue
 		}
+		if mountedNic == nil {
+			continue
+		}
+		log.V(1).Info("Successfully reconciled desired network interface", "NetworkInterfaceName", nicName)
+		mountedNics[nicName] = *mountedNic
+		nicStates = append(nicStates, api.NetworkInterfaceStatus{
+			Name:   nicName,
+			Handle: mountedNic.networkInterface.Handle,
+			State:  api.NetworkInterfaceStateAttached,
+		})
 	}
 
 	for nicName, machineNic := range machineNicByName {
 		if _, ok := mountedNics[nicName]; ok {
 			continue
 		}
+		if _, ok := desiredNics[nicName]; ok {
+			log.V(1).Info("Skipping not ready NICs", "NetworkInterfaceName", nicName)
+			continue
+		}
 
 		log.V(1).Info("Tearing down network interface", "NetworkInterfaceName", nicName)
 		if err := r.deleteNetworkInterface(ctx, machine, machineNic); err != nil {
@@ -210,6 +217,9 @@ func (r *MachineReconciler) reconcileDesiredNetworkInterface(
 	nic *api.NetworkInterfaceSpec,
 ) (*mountedNetworkInterface, error) {
 	providerNic, err := r.networkInterfacePlugin.Apply(ctx, nic, machine)
+	if errors.Is(err, providernetworkinterface.ErrNotReady) {
+		return nil, nil
+	}
 	if err != nil {
 		return nil, err
 	}

internal/networkinterfaceplugin/apinet.go

@@ -8,7 +8,6 @@ import (
 	"crypto/x509"
 	"crypto/x509/pkix"
 	"fmt"
-	"time"
 
 	apinetv1alpha1 "github.com/ironcore-dev/ironcore-net/api/core/v1alpha1"
 	networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1"
@@ -21,7 +20,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 var scheme = runtime.NewScheme()
@@ -32,9 +30,7 @@ func init() {
 }
 
 type apinetOptions struct {
-	APInetNodeName  string
-	PollingDuration time.Duration
-	PollingInterval time.Duration
+	APInetNodeName string
 
 	GetConfigOptions config.GetConfigOptions
 }
@@ -45,8 +41,6 @@ func (o *apinetOptions) PluginName() string {
 
 func (o *apinetOptions) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&o.APInetNodeName, "apinet-node-name", "", "APInet node name")
-	fs.DurationVar(&o.PollingDuration, "apinet-polling-duration", 30*time.Second, "Duration to poll for apinet network interface readiness")
-	fs.DurationVar(&o.PollingInterval, "apinet-polling-interval", 1*time.Second, "Interval between apinet network interface readiness polls")
 	o.GetConfigOptions.BindFlags(fs, config.WithNamePrefix("apinet-"))
 }
 
@@ -80,12 +74,7 @@ func (o *apinetOptions) NetworkInterfacePlugin(ctx context.Context) (
 		return nil, nil, nil, fmt.Errorf("error getting apinet config: %w", err)
 	}
 
-	apinetClient, err := client.New(cfg, client.Options{Scheme: scheme})
-	if err != nil {
-		return nil, nil, nil, fmt.Errorf("error creating apinet client: %w", err)
-	}
-
-	return apinet.NewPlugin(o.APInetNodeName, apinetClient, o.PollingDuration, o.PollingInterval), configCtrl, nil, nil
+	return apinet.NewPlugin(o.APInetNodeName, cfg), configCtrl, nil, nil
 }
 
 func init() {