Fix in the code for the externallyManage

Signed-off-by: Sebastian Sch <[email protected]>

pkg/daemon/daemon.go

@@ -458,6 +458,15 @@ func (dn *Daemon) nodeStateSyncHandler() error {
 		syncStatus:    syncStatusInProgress,
 		lastSyncError: "",
 	}
+	// wait for writer to refresh status then pull again the latest node state
+	<-dn.syncCh
+	updatedState, err := dn.client.SriovnetworkV1().SriovNetworkNodeStates(namespace).Get(context.Background(), dn.name, metav1.GetOptions{})
+	if err != nil {
+		glog.Warningf("nodeStateSyncHandler(): Failed to fetch node state %s: %v", dn.name, err)
+		return err
+	}
+	// we only update the status to avoid any race conditions where a new policy can be applied
+	latestState.Status = updatedState.Status
 
 	// load plugins if has not loaded
 	if len(dn.enabledPlugins) == 0 {

pkg/daemon/writer.go

@@ -100,10 +100,7 @@ func (w *NodeStateStatusWriter) Run(stop <-chan struct{}, refresh <-chan Message
 			if err != nil {
 				glog.Errorf("Run() refresh: writing to node status failed: %v", err)
 			}
-
-			if msg.syncStatus == syncStatusSucceeded || msg.syncStatus == syncStatusFailed {
-				syncCh <- struct{}{}
-			}
+			syncCh <- struct{}{}
 		case <-time.After(30 * time.Second):
 			glog.V(2).Info("Run(): period refresh")
 			if err := w.pollNicStatus(platformType); err != nil {