address more review comments

nutanix-cloud-native · Jul 31, 2024 · 452336c · 452336c
1 parent 5cecf9d
commit 452336c
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/controllers/nutanixmachine_controller.go b/controllers/nutanixmachine_controller.go
@@ -403,17 +403,17 @@ func (r *NutanixMachineReconciler) detachVolumeGroups(rctx *nctx.MachineContext,
 		return err
 	}
 
-	if createV4Client {
-		v4Client, err := getPrismCentralV4ClientForCluster(rctx.Context, rctx.NutanixCluster, r.SecretInformer, r.ConfigMapInformer)
-		if err != nil {
-			err := fmt.Errorf("error occurred while fetching Prism Central v4 client: %w", err)
-			return err
-		}
+	if !createV4Client {
+		return nil
+	}
 
-		if err := detachVolumeGroupsFromVM(rctx.Context, v4Client, vmUUID); err != nil {
-			err := fmt.Errorf("failed to detach volume groups from VM %s with UUID %s: %w", rctx.Machine.Name, vmUUID, err)
-			return err
-		}
+	v4Client, err := getPrismCentralV4ClientForCluster(rctx.Context, rctx.NutanixCluster, r.SecretInformer, r.ConfigMapInformer)
+	if err != nil {
+		return fmt.Errorf("error occurred while fetching Prism Central v4 client: %w", err)
+	}
+
+	if err := detachVolumeGroupsFromVM(rctx.Context, v4Client, vmUUID); err != nil {
+		return fmt.Errorf("failed to detach volume groups from VM %s with UUID %s: %w", rctx.Machine.Name, vmUUID, err)
 	}
 
 	return nil