Merge pull request #795 from openshift-cherrypick-robot/cherry-pick-7…

…90-to-release-4.11

[release-4.11] Bug 2110958: Use actualDaemonSet for SetDaemonSetGeneration

pkg/operator/nodecadaemon.go

@@ -80,7 +80,16 @@ func (c *NodeCADaemonController) processNextWorkItem() bool {
 	}
 	defer c.queue.Done(obj)
 
-	klog.V(4).Infof("get event from workqueue")
+	klog.V(4).Infof("get event from workqueue: %s", obj)
+
+	// the workqueueKey we reference here is different than the one we use in eventHandler
+	// use that to identify we are processing an item that was added back to the queue
+	// can remove if not useful but curious why this didn't seem to be working for the
+	// caches not synced error
+	if obj == workqueueKey {
+		klog.V(2).Infof("NodeCADaemonController processing requeued item  %s", obj)
+	}
+
 	if err := c.sync(); err != nil {
 		c.queue.AddRateLimited(workqueueKey)
 		klog.Errorf("NodeCADaemonController: unable to sync: %s, requeuing", err)

pkg/resource/nodecadaemon.go

@@ -18,7 +18,7 @@ import (
 	"github.com/openshift/library-go/pkg/operator/resource/resourceread"
 	"github.com/openshift/library-go/pkg/operator/v1helpers"
 
-	"github.com/openshift/cluster-image-registry-operator/bindata"
+	assets "github.com/openshift/cluster-image-registry-operator/bindata"
 	"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
 )
 
@@ -70,27 +70,26 @@ func (ds *generatorNodeCADaemonSet) Create() (runtime.Object, error) {
 }
 
 func (ds *generatorNodeCADaemonSet) Update(o runtime.Object) (runtime.Object, bool, error) {
-	daemonSet := ds.expected()
+	desiredDaemonSet := ds.expected()
 
 	_, opStatus, _, err := ds.operatorClient.GetOperatorState()
 	if err != nil {
 		return nil, false, err
 	}
-
-	dep, updated, err := resourceapply.ApplyDaemonSet(
+	actualDaemonSet, updated, err := resourceapply.ApplyDaemonSet(
 		context.TODO(),
 		ds.client,
 		ds.recorder,
-		daemonSet,
-		resourcemerge.ExpectedDaemonSetGeneration(daemonSet, opStatus.Generations),
+		desiredDaemonSet,
+		resourcemerge.ExpectedDaemonSetGeneration(desiredDaemonSet, opStatus.Generations),
 	)
 	if err != nil {
 		return o, updated, err
 	}
 
 	if updated {
 		updateStatusFn := func(newStatus *operatorv1.OperatorStatus) error {
-			resourcemerge.SetDaemonSetGeneration(&newStatus.Generations, daemonSet)
+			resourcemerge.SetDaemonSetGeneration(&newStatus.Generations, actualDaemonSet)
 			return nil
 		}
 
@@ -100,11 +99,11 @@ func (ds *generatorNodeCADaemonSet) Update(o runtime.Object) (runtime.Object, bo
 			updateStatusFn,
 		)
 		if err != nil {
-			return dep, updated, err
+			return actualDaemonSet, updated, err
 		}
 	}
 
-	return dep, updated, nil
+	return actualDaemonSet, updated, nil
 }
 
 func (ds *generatorNodeCADaemonSet) Delete(opts metav1.DeleteOptions) error {