feat: react on device actions also if not in Running

Author: swagner-de

internal/controller/core/device_controller.go

@@ -86,6 +86,17 @@ func (r *DeviceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ c
 		return ctrl.Result{}, err
 	}
 
+	prov, ok := r.Provider().(provider.DeviceProvider)
+	if !ok {
+		err := errors.New("provider does not implement DeviceProvider interface")
+		log.Error(err, "failed to reconcile resource")
+		return ctrl.Result{}, err
+	}
+	conn, err := deviceutil.GetDeviceConnection(ctx, r, obj)
+	if err != nil {
+		return ctrl.Result{}, fmt.Errorf("failed to obtain device connection: %w", err)
+	}
+
 	orig := obj.DeepCopy()
 
 	if conditions.InitializeConditions(obj, v1alpha1.ReadyCondition) {
@@ -168,10 +179,6 @@ func (r *DeviceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ c
 		}
 		log.Info("Device provisioning completed, running post provisioning checks")
 		prov, _ := r.Provider().(provider.ProvisioningProvider)
-		conn, err := deviceutil.GetDeviceConnection(ctx, r, obj)
-		if err != nil {
-			return ctrl.Result{}, fmt.Errorf("failed to obtain device connection: %w", err)
-		}
 		if ok := prov.VerifyProvisioned(ctx, conn, obj); !ok {
 			return ctrl.Result{RequeueAfter: r.RequeueInterval}, nil
 		}
@@ -180,7 +187,7 @@ func (r *DeviceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ c
 		obj.Status.Phase = v1alpha1.DevicePhaseRunning
 
 	case v1alpha1.DevicePhaseRunning:
-		if err := r.reconcile(ctx, obj); err != nil {
+		if err := r.reconcile(ctx, obj, prov, conn); err != nil {
 			log.Error(err, "Failed to reconcile resource")
 			return ctrl.Result{}, err
 		}
@@ -199,7 +206,10 @@ func (r *DeviceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ c
 		obj.Status.Phase = v1alpha1.DevicePhaseRunning
 	}
 
-	log.Info(fmt.Sprintf("End of Reconcile(), phase was is %s", obj.Status.Phase))
+	if err := r.handleDeviceActions(ctx, obj, prov, conn); err != nil {
+		return ctrl.Result{}, err
+	}
+
 	return ctrl.Result{}, nil
 }
 
@@ -244,77 +254,67 @@ func (r *DeviceReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Complete(r)
 }
 
-func (r *DeviceReconciler) reconcile(ctx context.Context, device *v1alpha1.Device) (reterr error) {
-	if prov, ok := r.Provider().(provider.DeviceProvider); ok {
-		conn, err := deviceutil.GetDeviceConnection(ctx, r, device)
-		if err != nil {
-			return err
+func (r *DeviceReconciler) reconcile(ctx context.Context, device *v1alpha1.Device, prov provider.DeviceProvider, conn *deviceutil.Connection) (reterr error) {
+	if err := prov.Connect(ctx, conn); err != nil {
+		conditions.Set(device, metav1.Condition{
+			Type:    v1alpha1.ReadyCondition,
+			Status:  metav1.ConditionFalse,
+			Reason:  v1alpha1.UnreachableReason,
+			Message: fmt.Sprintf("Failed to connect to provider: %v", err),
+		})
+		return fmt.Errorf("failed to connect to provider: %w", err)
+	}
+	defer func() {
+		if err := prov.Disconnect(ctx, conn); err != nil {
+			reterr = kerrors.NewAggregate([]error{reterr, err})
 		}
+	}()
 
-		if err := r.handleDeviceActions(ctx, device, prov, conn); err != nil {
-			return err
-		}
+	ports, err := prov.ListPorts(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to list device ports: %w", err)
+	}
 
-		if err := prov.Connect(ctx, conn); err != nil {
-			conditions.Set(device, metav1.Condition{
-				Type:    v1alpha1.ReadyCondition,
-				Status:  metav1.ConditionFalse,
-				Reason:  v1alpha1.UnreachableReason,
-				Message: fmt.Sprintf("Failed to connect to provider: %v", err),
-			})
-			return fmt.Errorf("failed to connect to provider: %w", err)
-		}
-		defer func() {
-			if err := prov.Disconnect(ctx, conn); err != nil {
-				reterr = kerrors.NewAggregate([]error{reterr, err})
-			}
-		}()
+	interfaces := new(v1alpha1.InterfaceList)
+	if err := r.List(ctx, interfaces, client.InNamespace(device.Namespace), client.MatchingLabels{v1alpha1.DeviceLabel: device.Name}); err != nil {
+		return fmt.Errorf("failed to list interface resources for device: %w", err)
+	}
 
-		ports, err := prov.ListPorts(ctx)
-		if err != nil {
-			return fmt.Errorf("failed to list device ports: %w", err)
-		}
+	m := make(map[string]string) // ID => Resource Name
+	for _, intf := range interfaces.Items {
+		m[intf.Spec.Name] = intf.Name
+	}
 
-		interfaces := new(v1alpha1.InterfaceList)
-		if err := r.List(ctx, interfaces, client.InNamespace(device.Namespace), client.MatchingLabels{v1alpha1.DeviceLabel: device.Name}); err != nil {
-			return fmt.Errorf("failed to list interface resources for device: %w", err)
+	device.Status.Ports = make([]v1alpha1.DevicePort, len(ports))
+	n := int32(0)
+	for i, p := range ports {
+		var ref *v1alpha1.LocalObjectReference
+		if name, ok := m[p.ID]; ok {
+			ref = &v1alpha1.LocalObjectReference{Name: name}
+			n++
 		}
-
-		m := make(map[string]string) // ID => Resource Name
-		for _, intf := range interfaces.Items {
-			m[intf.Spec.Name] = intf.Name
+		device.Status.Ports[i] = v1alpha1.DevicePort{
+			Name:                p.ID,
+			Type:                p.Type,
+			SupportedSpeedsGbps: p.SupportedSpeedsGbps,
+			Transceiver:         p.Transceiver,
+			InterfaceRef:        ref,
 		}
+		slices.Sort(device.Status.Ports[i].SupportedSpeedsGbps)
+	}
 
-		device.Status.Ports = make([]v1alpha1.DevicePort, len(ports))
-		n := int32(0)
-		for i, p := range ports {
-			var ref *v1alpha1.LocalObjectReference
-			if name, ok := m[p.ID]; ok {
-				ref = &v1alpha1.LocalObjectReference{Name: name}
-				n++
-			}
-			device.Status.Ports[i] = v1alpha1.DevicePort{
-				Name:                p.ID,
-				Type:                p.Type,
-				SupportedSpeedsGbps: p.SupportedSpeedsGbps,
-				Transceiver:         p.Transceiver,
-				InterfaceRef:        ref,
-			}
-			slices.Sort(device.Status.Ports[i].SupportedSpeedsGbps)
-		}
+	device.Status.PostSummary = PortSummary(device.Status.Ports)
 
-		device.Status.PostSummary = PortSummary(device.Status.Ports)
+	info, err := prov.GetDeviceInfo(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get device details: %w", err)
+	}
 
-		info, err := prov.GetDeviceInfo(ctx)
-		if err != nil {
-			return fmt.Errorf("failed to get device details: %w", err)
-		}
+	device.Status.Manufacturer = info.Manufacturer
+	device.Status.Model = info.Model
+	device.Status.SerialNumber = info.SerialNumber
+	device.Status.FirmwareVersion = info.FirmwareVersion
 
-		device.Status.Manufacturer = info.Manufacturer
-		device.Status.Model = info.Model
-		device.Status.SerialNumber = info.SerialNumber
-		device.Status.FirmwareVersion = info.FirmwareVersion
-	}
 	conditions.Set(device, metav1.Condition{
 		Type:    v1alpha1.ReadyCondition,
 		Status:  metav1.ConditionTrue,