Merge pull request openshift#1100 from SchSeba/merge-bot-master

Merge https://github.com/k8snetworkplumbingwg/sriov-network-operator:master into main

Author: openshift-merge-bot[bot]

bundle/manifests/sriov-network-operator.clusterserviceversion.yaml

@@ -100,7 +100,7 @@ metadata:
     categories: Networking
     certified: "false"
     containerImage: quay.io/openshift/origin-sriov-network-operator:4.19
-    createdAt: "2025-06-02T23:48:40Z"
+    createdAt: "2025-06-04T23:48:47Z"
     description: An operator for configuring SR-IOV components and initializing SRIOV
       network devices in Openshift cluster.
     features.operators.openshift.io/cnf: "false"

manifests/stable/sriov-network-operator.clusterserviceversion.yaml

@@ -100,7 +100,7 @@ metadata:
     categories: Networking
     certified: "false"
     containerImage: quay.io/openshift/origin-sriov-network-operator:4.19
-    createdAt: "2025-06-02T23:48:40Z"
+    createdAt: "2025-06-04T23:48:47Z"
     description: An operator for configuring SR-IOV components and initializing SRIOV
       network devices in Openshift cluster.
     features.operators.openshift.io/cnf: "false"

pkg/daemon/daemon.go

@@ -260,9 +260,13 @@ func (dn *NodeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 			reqLogger.Error(err, "failed to handle drain")
 			return ctrl.Result{}, err
 		}
-		// drain is still in progress we don't need to re-queue the request as the operator will update the annotation
+
+		// TODO: remove this after we stop using the node annotation
+		// drain is still in progress we will still requeue the request in case there is an un-expect state in the draining
+		// this will allow the daemon to try again.
 		if drainInProcess {
-			return ctrl.Result{}, nil
+			reqLogger.Info("node drain still in progress, requeue")
+			return ctrl.Result{RequeueAfter: consts.DaemonRequeueTime}, nil
 		}
 	}