Merge pull request #3384 from rewantsoni/uninstall

controller: fix deletion phase

Author: openshift-merge-bot[bot]

controllers/storagecluster/storageclient.go

@@ -9,11 +9,11 @@ import (
 	ocsv1a1 "github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1"
 	"github.com/red-hat-storage/ocs-operator/v4/controllers/defaults"
 	"github.com/red-hat-storage/ocs-operator/v4/controllers/util"
-	rookCephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
 
 	ocsclientv1a1 "github.com/red-hat-storage/ocs-client-operator/api/v1alpha1"
+	rookCephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
 	corev1 "k8s.io/api/core/v1"
-	kerrors "k8s.io/apimachinery/pkg/api/errors"
+	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -97,10 +97,14 @@ func (s *storageClient) ensureDeleted(r *StorageClusterReconciler, storagecluste
 	}
 	storageClient := &ocsclientv1a1.StorageClient{}
 	storageClient.Name = storagecluster.Name
+	if err := r.Get(r.ctx, client.ObjectKeyFromObject(storageClient), storageClient); client.IgnoreNotFound(err) != nil {
+		return ctrl.Result{}, fmt.Errorf("failed to get storageclient %s: %v", storageClient.Name, err)
+	} else if storageClient.UID == "" {
+		return reconcile.Result{}, nil
+	}
 
-	if err := r.Delete(r.ctx, storageClient); err != nil && !kerrors.IsNotFound(err) {
-		r.Log.Error(err, "Failed to initiate deletion of local StorageClient CR")
-		return reconcile.Result{}, err
+	if err := r.Delete(r.ctx, storageClient); err != nil {
+		return reconcile.Result{}, fmt.Errorf("failed to delete storageclient %s: %v", storageClient.Name, err)
 	}
 
 	if controllerutil.RemoveFinalizer(storageClient, internalComponentFinalizer) {

controllers/storagecluster/storageconsumer.go

@@ -190,24 +190,39 @@ func (s *storageConsumer) ensureDeleted(r *StorageClusterReconciler, storageClus
 	storageConsumer := &ocsv1a1.StorageConsumer{}
 	storageConsumer.Name = defaults.LocalStorageConsumerName
 	storageConsumer.Namespace = storageCluster.Namespace
-	if err := r.Get(r.ctx, client.ObjectKeyFromObject(storageConsumer), storageConsumer); err != nil {
-		if client.IgnoreNotFound(err) != nil {
-			return ctrl.Result{}, fmt.Errorf("failed to get storageconsumer %s: %v", storageConsumer.Name, err)
+	if err := r.Get(r.ctx, client.ObjectKeyFromObject(storageConsumer), storageConsumer); client.IgnoreNotFound(err) != nil {
+		return ctrl.Result{}, fmt.Errorf("failed to get storageconsumer %s: %v", storageConsumer.Name, err)
+	} else if storageConsumer.UID != "" {
+		if storageConsumer.Status.Client != nil {
+			return ctrl.Result{}, fmt.Errorf("waiting for client to offboard before deleting storageconsumer %s", storageConsumer.Name)
 		}
-		return ctrl.Result{}, nil
-	}
 
-	if err := r.Delete(r.ctx, storageConsumer); err != nil {
-		return ctrl.Result{}, fmt.Errorf("failed to delete storageconsumer %s: %v", storageConsumer.Name, err)
-	}
+		if err := r.Delete(r.ctx, storageConsumer); err != nil {
+			return ctrl.Result{}, fmt.Errorf("failed to delete storageconsumer %s: %v", storageConsumer.Name, err)
+		}
 
-	if controllerutil.RemoveFinalizer(storageConsumer, internalComponentFinalizer) {
-		r.Log.Info("Removing finalizer from StorageConsumer.", "StorageConsumer:", storageConsumer.Name, " StorageConsumer Namespace:", storageConsumer.Namespace, " Finalizer:", internalComponentFinalizer)
-		if err := r.Update(r.ctx, storageConsumer); err != nil {
-			r.Log.Info("Failed to remove finalizer from StorageConsumer.", "StorageConsumer:", storageConsumer.Name, "Finalizer:", internalComponentFinalizer)
-			return ctrl.Result{}, fmt.Errorf("failed to remove finalizer from StorageConsumer: %v", err)
+		if controllerutil.RemoveFinalizer(storageConsumer, internalComponentFinalizer) {
+			r.Log.Info("Removing finalizer from StorageConsumer.", "StorageConsumer:", storageConsumer.Name, " StorageConsumer Namespace:", storageConsumer.Namespace, " Finalizer:", internalComponentFinalizer)
+			if err := r.Update(r.ctx, storageConsumer); err != nil {
+				r.Log.Info("Failed to remove finalizer from StorageConsumer.", "StorageConsumer:", storageConsumer.Name, "Finalizer:", internalComponentFinalizer)
+				return ctrl.Result{}, fmt.Errorf("failed to remove finalizer from StorageConsumer: %v", err)
+			}
 		}
 	}
+
+	// The internal consumer configmap is owned by both storagecluster and storage consumer and will not be deleted
+	// before storage cluster is deleted. The ceph resources created by the consumer are owned by the primary consumer
+	//  and consumer configmap. The storage cluster will wait in deletion phase till cephcluster is deleted, and the
+	// ceph cluster will wait till all ceph resources are deleted. This creates a cyclic dependency, hence we need the
+	// internal consumer configmap to be deleted when storagecluster deletion is triggered
+	consumerConfigMap := &corev1.ConfigMap{}
+	consumerConfigMap.Name = defaults.LocalStorageConsumerConfigMapName
+	consumerConfigMap.Namespace = storageCluster.Namespace
+
+	if err := r.Delete(r.ctx, consumerConfigMap); client.IgnoreNotFound(err) != nil {
+		return ctrl.Result{}, fmt.Errorf("failed to delete local consumerConfigMap %s: %v", consumerConfigMap.Name, err)
+	}
+
 	return ctrl.Result{}, nil
 }