Merge pull request openshift#1088 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-04-29T23:49:29Z"
+    createdAt: "2025-05-11T23:49:34Z"
     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-04-29T23:49:29Z"
+    createdAt: "2025-05-11T23:49:34Z"
     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

@@ -666,16 +666,19 @@ func (dn *NodeReconciler) annotate(
 	funcLog := log.Log.WithName("annotate")
 
 	funcLog.Info(fmt.Sprintf("apply '%s' annotation for node", annotationState))
-	err := utils.AnnotateNode(ctx, desiredNodeState.Name, consts.NodeDrainAnnotation, annotationState, dn.client)
-	if err != nil {
-		log.Log.Error(err, "Failed to annotate node")
+	if err := utils.AnnotateNode(ctx,
+		desiredNodeState.Name,
+		consts.NodeDrainAnnotation,
+		annotationState, dn.client); err != nil {
+		funcLog.Error(err, "Failed to annotate node")
 		return err
 	}
 
 	funcLog.Info(fmt.Sprintf("apply '%s' annotation for nodeState", annotationState))
-	if err := utils.AnnotateObject(context.Background(), desiredNodeState,
+	if err := utils.AnnotateObject(ctx, desiredNodeState,
 		consts.NodeStateDrainAnnotation,
 		annotationState, dn.client); err != nil {
+		funcLog.Error(err, "Failed to annotate nodeState")
 		return err
 	}