Merge pull request rook#4518 from travisn/is-upgrade

Only perform upgrade checks when the image changes

pkg/operator/ceph/cluster/cluster.go

@@ -379,7 +379,7 @@ func (c *cluster) checkSetOrchestrationStatus() bool {
 }
 
 // This function compare the Ceph spec image and the cluster running version
-// It returns false if the image is different and true if identical
+// It returns true if the image is different and false if identical
 func diffImageSpecAndClusterRunningVersion(imageSpecVersion cephver.CephVersion, runningVersions client.CephDaemonsVersions) (bool, error) {
 	numberOfCephVersions := len(runningVersions.Overall)
 	if numberOfCephVersions == 0 {
@@ -403,10 +403,9 @@ func diffImageSpecAndClusterRunningVersion(imageSpecVersion cephver.CephVersion,
 			clusterRunningVersion := *version
 
 			// If this is the same version
-			// We return 'true' so that we restart using the Ceph checks
 			if cephver.IsIdentical(clusterRunningVersion, imageSpecVersion) {
 				logger.Debugf("both cluster and image spec versions are identical, doing nothing %s", imageSpecVersion.String())
-				return true, nil
+				return false, nil
 			}
 
 			if cephver.IsSuperior(imageSpecVersion, clusterRunningVersion) {

pkg/operator/ceph/cluster/cluster_test.go

@@ -109,7 +109,7 @@ func TestDiffImageSpecAndClusterRunningVersion(t *testing.T) {
 
 	m, err = diffImageSpecAndClusterRunningVersion(fakeImageVersion, dummyRunningVersions5)
 	assert.NoError(t, err)
-	assert.True(t, m)
+	assert.False(t, m)
 }
 
 func TestMinVersion(t *testing.T) {

pkg/operator/ceph/cluster/controller.go

@@ -624,6 +624,7 @@ func (c *ClusterController) onUpdate(oldObj, newObj interface{}) {
 	// Also we make sure there is actually an upgrade to perform
 	// It's not because the image spec changed that the ceph version did
 	// Someone could use the same Ceph version but with a different base OS content
+	cluster.isUpgrade = false
 	if versionChanged {
 		// we compare against cluster.Info.CephVersion since it received the new spec version earlier
 		// so don't get confused by the name of the function and its arguments
@@ -645,9 +646,9 @@ func (c *ClusterController) onUpdate(oldObj, newObj interface{}) {
 					return
 				}
 			}
-			// If Ceph is healthy let's start the upgrade!
-			cluster.isUpgrade = true
 		}
+		// If Ceph is healthy let's start the upgrade!
+		cluster.isUpgrade = true
 	} else {
 		logger.Infof("ceph daemons running versions are: %+v", runningVersions)
 	}