Merge pull request #1974 from hasbro17/fix-csv-status-time-comparison

openshift-merge-robot · web-flow · commit 0373c9ba7c3d · 2021-02-02T16:11:58.000-05:00
Bug 1917537: Fix time comparison in CSV reconcile loop
diff --git a/pkg/controller/operators/olm/operator.go b/pkg/controller/operators/olm/operator.go
@@ -1097,7 +1097,7 @@ func (a *Operator) syncClusterServiceVersion(obj interface{}) (syncError error)
 	}
 
 	// status changed, update CSV
-	if !(outCSV.Status.LastUpdateTime == clusterServiceVersion.Status.LastUpdateTime &&
+	if !(outCSV.Status.LastUpdateTime.Equal(clusterServiceVersion.Status.LastUpdateTime) &&
 		outCSV.Status.Phase == clusterServiceVersion.Status.Phase &&
 		outCSV.Status.Reason == clusterServiceVersion.Status.Reason &&
 		outCSV.Status.Message == clusterServiceVersion.Status.Message) {

Original file line number	Diff line number	Diff line change
`@@ -1097,7 +1097,7 @@ func (a *Operator) syncClusterServiceVersion(obj interface{}) (syncError error)`
`1097`	`1097`	`}`
`1098`	`1098`
`1099`	`1099`	`// status changed, update CSV`
`1100`		`- if !(outCSV.Status.LastUpdateTime == clusterServiceVersion.Status.LastUpdateTime &&`
	`1100`	`+ if !(outCSV.Status.LastUpdateTime.Equal(clusterServiceVersion.Status.LastUpdateTime) &&`
`1101`	`1101`	`outCSV.Status.Phase == clusterServiceVersion.Status.Phase &&`
`1102`	`1102`	`outCSV.Status.Reason == clusterServiceVersion.Status.Reason &&`
`1103`	`1103`	`outCSV.Status.Message == clusterServiceVersion.Status.Message) {`