Descriptive restore error on terminating namespace

Signed-off-by: Tiger Kaovilai <[email protected]>

changelogs/unreleased/7424-kaovilai

@@ -0,0 +1 @@
+Descriptive restore error when restoring into a terminating namespace

pkg/util/kube/utils.go

@@ -72,6 +72,8 @@ func EnsureNamespaceExistsAndIsReady(namespace *corev1api.Namespace, client core
 	// required for keeping track of number of restored items
 	var nsCreated bool
 	var ready bool
+	// if namespace is marked for deletion, and we timed out, report an error
+	var markedForDeletion bool
 	err := wait.PollImmediate(time.Second, timeout, func() (bool, error) {
 		clusterNS, err := client.Get(context.TODO(), namespace.Name, metav1.GetOptions{})
 
@@ -87,6 +89,7 @@ func EnsureNamespaceExistsAndIsReady(namespace *corev1api.Namespace, client core
 
 		if clusterNS != nil && (clusterNS.GetDeletionTimestamp() != nil || clusterNS.Status.Phase == corev1api.NamespaceTerminating) {
 			// Marked for deletion, keep waiting
+			markedForDeletion = true
 			return false, nil
 		}
 
@@ -97,6 +100,9 @@ func EnsureNamespaceExistsAndIsReady(namespace *corev1api.Namespace, client core
 
 	// err will be set if we timed out or encountered issues retrieving the namespace,
 	if err != nil {
+		if markedForDeletion {
+			return false, nsCreated, errors.Wrapf(err, "timed out waiting for namespace %s marked for deletion to disappear before restoring", namespace.Name)
+		}
 		return false, nsCreated, errors.Wrapf(err, "error getting namespace %s", namespace.Name)
 	}