Merge pull request #500 from jottofar/bug-1905221-fix

Bug 1905221: pkg/cvo/sync_worker.go: Ignore work changes during init

Author: openshift-merge-robot

pkg/cvo/sync_worker.go

@@ -222,7 +222,7 @@ func (w *SyncWorker) Update(generation int64, desired configv1.Update, overrides
 		return w.status.DeepCopy()
 	}
 
-	if equalSyncWork(w.work, work) {
+	if equalSyncWork(w.work, work, state) {
 		klog.V(5).Info("Update work is equal to current target; no change required")
 		return w.status.DeepCopy()
 	}
@@ -401,7 +401,7 @@ func (w *SyncWorker) calculateNext(work *SyncWork) bool {
 	w.lock.Lock()
 	defer w.lock.Unlock()
 
-	changed := !equalSyncWork(w.work, work)
+	changed := !equalSyncWork(w.work, work, w.work.State)
 
 	// if this is the first time through the loop, initialize reconciling to
 	// the state Update() calculated (to allow us to start in reconciling)
@@ -465,7 +465,7 @@ func splitDigest(pullspec string) string {
 }
 
 // equalSyncWork returns true if a and b are equal.
-func equalSyncWork(a, b *SyncWork) bool {
+func equalSyncWork(a, b *SyncWork, state payload.State) bool {
 	if a == b {
 		return true
 	}
@@ -475,14 +475,20 @@ func equalSyncWork(a, b *SyncWork) bool {
 	sameVersion := equalUpdate(a.Desired, b.Desired)
 	overridesEqual := reflect.DeepEqual(a.Overrides, b.Overrides)
 
+	var detected string
 	if !sameVersion && !overridesEqual {
-		klog.V(5).Info("Detected version and overrides changes")
-		return false
+		detected = "version and overrides changes"
 	} else if !sameVersion {
-		klog.V(5).Info("Detected version change")
-		return false
+		detected = "version change"
 	} else if !overridesEqual {
-		klog.V(5).Info("Detected overrides change")
+		detected = "overrides change"
+	}
+	if detected != "" {
+		if state == payload.InitializingPayload {
+			klog.Warning("Ignoring detected %s during payload initialization", detected)
+			return true
+		}
+		klog.V(5).Info("Detected %s", detected)
 		return false
 	}
 	return true