Merge pull request #2080 from tchap/must-gather-improve-cleanup-order

WRKLDS-593: oc adm must-gather: Improve cleanup order

Author: openshift-merge-bot[bot]

pkg/cli/admin/mustgather/mustgather.go

@@ -586,6 +586,16 @@ func (o *MustGatherOptions) Run() error {
 		o.PrintBasicClusterState(context.TODO())
 	}()
 
+	// Ensure resource cleanup unless instructed otherwise ...
+	var cleanupNamespace func()
+	if !o.Keep {
+		defer func() {
+			if cleanupNamespace != nil {
+				cleanupNamespace()
+			}
+		}()
+	}
+
 	// Due to 'stack unwiding', this should happen after 'clusterState' printing, to ensure that we always
 	//  print our ClusterState information.
 	runBackCollection := true
@@ -597,18 +607,14 @@ func (o *MustGatherOptions) Run() error {
 	}()
 
 	// Get or create "working" namespace ...
-	ns, cleanupNamespace, err := o.getNamespace()
+	var ns *corev1.Namespace
+	ns, cleanupNamespace, err = o.getNamespace()
 	if err != nil {
 		// ensure the errors bubble up to BackupGathering method for display
 		errs = []error{err}
 		return err
 	}
 
-	// ... ensure resource cleanup unless instructed otherwise ...
-	if !o.Keep {
-		defer cleanupNamespace()
-	}
-
 	// Prefer to run in master if there's any but don't be explicit otherwise.
 	// This enables the command to run by default in hypershift where there's no masters.
 	nodes, err := o.Client.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{