sync: attempt to fix race condition between pod/service deletion

If the pod isn't yet deleted when deleting its associated PVC and
service, scylla-operator could erroneously recreate the service.

pkg/controllers/cluster/sync.go

@@ -43,10 +43,10 @@ func (cc *ClusterReconciler) sync(c *scyllav1.ScyllaCluster) error {
 	}
 	logger.Debug(ctx, "All StatefulSets are up-to-date!")
 
-	// Cleanup Cluster resources
+	/*// Cleanup Cluster resources
 	if err := cc.cleanup(ctx, c); err != nil {
 		cc.Recorder.Event(c, corev1.EventTypeWarning, naming.ErrSyncFailed, MessageCleanupFailed)
-	}
+	}*/
 
 	// Sync Headless Service for Cluster
 	if err := cc.syncClusterHeadlessService(ctx, c); err != nil {
@@ -68,6 +68,12 @@ func (cc *ClusterReconciler) sync(c *scyllav1.ScyllaCluster) error {
 		return errors.Wrap(err, "failed to sync member service")
 	}
 
+	// Criteo: moved from before "Sync Headless Service for Cluster" to here
+	// Cleanup Cluster resources
+	if err := cc.cleanup(ctx, c); err != nil {
+		cc.Recorder.Event(c, corev1.EventTypeWarning, naming.ErrSyncFailed, MessageCleanupFailed)
+	}
+
 	// Update Status
 	logger.Info(ctx, "Calculating cluster status...")
 	if err := cc.updateStatus(ctx, c); err != nil {