Merge pull request #247 from wking/stop-clobbering-completion-time

Bug 1756461: pkg/cvo/status: Don't clobber last.CompletionTime when adding new entries
openshift · Oct 8, 2019 · bdb4644 · bdb4644
2 parents 0725bd5 + f81ba7a
commit bdb4644
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/cvo/status.go b/pkg/cvo/status.go
@@ -84,7 +84,9 @@ func mergeOperatorHistory(config *configv1.ClusterVersion, desired configv1.Upda
 		}
 	} else {
 		klog.V(5).Infof("must add a new history entry completed=%t desired=%#v != last=%#v", completed, desired, last)
-		last.CompletionTime = &now
+		if last.CompletionTime == nil {
+			last.CompletionTime = &now
+		}
 		if completed {
 			config.Status.History = append([]configv1.UpdateHistory{
 				{