If StatefulSet has not caught up yet, do not allow upgrade in any sit…

…uation

pkg/reconciliation/reconcile_racks.go

@@ -186,6 +186,25 @@ func (rc *ReconciliationContext) CheckRackPodTemplate() result.ReconcileResult {
 		}
 		statefulSet := rc.statefulSets[idx]
 
+		// If the statefulset is not updated from previous changes, do not allow modifying it yet
+		status := statefulSet.Status
+		if statefulSet.Generation != status.ObservedGeneration ||
+			status.Replicas != status.ReadyReplicas ||
+			status.Replicas != status.CurrentReplicas ||
+			status.Replicas != status.UpdatedReplicas {
+
+			logger.Info(
+				"waiting for upgrade to finish on statefulset",
+				"statefulset", statefulSet.Name,
+				"replicas", status.Replicas,
+				"readyReplicas", status.ReadyReplicas,
+				"currentReplicas", status.CurrentReplicas,
+				"updatedReplicas", status.UpdatedReplicas,
+			)
+
+			return result.RequeueSoon(10)
+		}
+
 		desiredSts, err := newStatefulSetForCassandraDatacenter(statefulSet, rackName, dc, int(*statefulSet.Spec.Replicas))
 
 		if err != nil {
@@ -300,29 +319,6 @@ func (rc *ReconciliationContext) CheckRackPodTemplate() result.ReconcileResult {
 			// we just updated k8s and pods will be knocked out of ready state, so let k8s
 			// call us back when these changes are done and the new pods are back to ready
 			return result.Done()
-		} else {
-
-			// the pod template is right, but if any pods don't match it,
-			// or are missing, we should not move onto the next rack,
-			// because there's an upgrade in progress
-
-			status := statefulSet.Status
-			if statefulSet.Generation != status.ObservedGeneration ||
-				status.Replicas != status.ReadyReplicas ||
-				status.Replicas != status.CurrentReplicas ||
-				status.Replicas != status.UpdatedReplicas {
-
-				logger.Info(
-					"waiting for upgrade to finish on statefulset",
-					"statefulset", statefulSet.Name,
-					"replicas", status.Replicas,
-					"readyReplicas", status.ReadyReplicas,
-					"currentReplicas", status.CurrentReplicas,
-					"updatedReplicas", status.UpdatedReplicas,
-				)
-
-				return result.RequeueSoon(10)
-			}
 		}
 	}