commands: update for logging

Signed-off-by: Javier <[email protected]>

pkg/crds/crds.go

@@ -81,7 +81,7 @@ func DeleteCustomResources(ctx context.Context, clientsets k8sutil.ClientsetsInt
 		logging.Fatal(err)
 	}
 	k8sutil.DeleteDeployment(ctx, k8sClientSet, clusterNamespace, toolBoxDeployment)
-	ensureClusterIsEmpty(ctx, k8sClientSet, clusterNamespace)
+	ensureClusterIsEmpty(ctx, k8sClientSet, clientsets, clusterNamespace)
 	logging.Info("done")
 }
 
@@ -145,7 +145,7 @@ func deleteCustomResources(ctx context.Context, clientsets k8sutil.ClientsetsInt
 					logging.Info(fmt.Sprintf("error the resource cannot be found due  %s", err.Error()))
 					return err
 				} else {
-					logging.Error(fmt.Errorf("resource was deleted succesfully %+v", item.GetName()))
+					logging.Error(fmt.Errorf("resource was deleted successfully %+v", item.GetName()))
 				}
 			} else {
 				logging.Error(fmt.Errorf("error resource was NOT deleted %+v", itemResource))
@@ -173,7 +173,7 @@ func updatingFinalizers(ctx context.Context, clientsets k8sutil.ClientsetsInterf
 	return nil
 }
 
-func ensureClusterIsEmpty(ctx context.Context, k8sClientSet kubernetes.Interface, clusterNamespace string) {
+func ensureClusterIsEmpty(ctx context.Context, k8sClientSet kubernetes.Interface, clientsets k8sutil.ClientsetsInterface, clusterNamespace string) {
 	logging.Info("waiting to clean up resources")
 	for {
 		pods, err := k8sClientSet.CoreV1().Pods(clusterNamespace).List(ctx, v1.ListOptions{LabelSelector: "rook_cluster=" + clusterNamespace})
@@ -188,6 +188,10 @@ func ensureClusterIsEmpty(ctx context.Context, k8sClientSet kubernetes.Interface
 			for _, pod := range pods.Items {
 				logging.Info(fmt.Sprintf("pod alive name:%s namespace: %s kind: %s finalizers: %+v", pod.Name, pod.Namespace, pod.Kind, pod.Finalizers))
 			}
+			err := deleteCustomResources(ctx, clientsets, clusterNamespace)
+			if err != nil {
+				logging.Fatal(err)
+			}
 		}
 	}
 }