test/e2e: Create and clean up namespace in main_test

- Create a new namespace at the start of the test run and wait
for it to be ready before starting
- If Teardown is done then delete it at the end of the test run

Fixes: #1652
Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Co-authored-by: Da Li Liu <liudali@cn.ibm.com>

test/e2e/assessment_helpers.go

@@ -19,11 +19,14 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/e2e-framework/klient"
+	"sigs.k8s.io/e2e-framework/klient/k8s"
 	"sigs.k8s.io/e2e-framework/klient/wait"
 	"sigs.k8s.io/e2e-framework/klient/wait/conditions"
 	"sigs.k8s.io/e2e-framework/pkg/env"
 )
 
+const WAIT_NAMESPACE_AVAILABLE_TIMEOUT = time.Second * 120
+
 func reverseSlice(slice []string) []string {
 	length := len(slice)
 	for i := 0; i < length/2; i++ {
@@ -476,3 +479,43 @@ func DeletePod(ctx context.Context, client klient.Client, pod *v1.Pod, tcDelDura
 	log.Infof("Pod %s has been successfully deleted within %.0fs", pod.Name, tcDelDuration.Seconds())
 	return nil
 }
+
+func CreateAndWaitForNamespace(ctx context.Context, client klient.Client, namespaceName string) error {
+	log.Infof("Creating namespace %s", namespaceName)
+	nsObj := v1.Namespace{}
+	nsObj.Name = namespaceName
+	if err := client.Resources().Create(ctx, &nsObj); err != nil {
+		return err
+	}
+
+	log.Infof("Wait for namespace '%s' be ready", namespaceName)
+	if err := wait.For(conditions.New(client.Resources()).ResourceMatch(&nsObj, func(object k8s.Object) bool {
+		ns, ok := object.(*v1.Namespace)
+		if !ok {
+			log.Printf("Not a namespace object: %v", object)
+			return false
+		}
+		return ns.Status.Phase == v1.NamespaceActive
+	}), wait.WithTimeout(WAIT_NAMESPACE_AVAILABLE_TIMEOUT)); err != nil {
+		return err
+	}
+	log.Infof("Namespace '%s' is ready", namespaceName)
+	return nil
+}
+
+func DeleteAndWaitForNamespace(ctx context.Context, client klient.Client, namespaceName string) error {
+	nsObj := v1.Namespace{}
+	nsObj.Name = namespaceName
+	if err := client.Resources().Delete(ctx, &nsObj); err != nil {
+		return err
+	}
+	log.Infof("Deleting namespace '%s'...", nsObj.Name)
+	if err := wait.For(conditions.New(
+		client.Resources()).ResourceDeleted(&nsObj),
+		wait.WithInterval(5*time.Second),
+		wait.WithTimeout(60*time.Second)); err != nil {
+		return err
+	}
+	log.Infof("Namespace '%s' has been successfully deleted within 60s", nsObj.Name)
+	return nil
+}

test/e2e/main_test.go

@@ -138,6 +138,11 @@ func TestMain(m *testing.M) {
 				return ctx, err
 			}
 		}
+
+		if err = CreateAndWaitForNamespace(ctx, cfg.Client(), E2eNamespace); err != nil {
+			return ctx, err
+		}
+
 		return ctx, nil
 	})
 
@@ -146,6 +151,11 @@ func TestMain(m *testing.M) {
 		if !shouldTeardown {
 			return ctx, nil
 		}
+
+		if err = DeleteAndWaitForNamespace(ctx, cfg.Client(), E2eNamespace); err != nil {
+			return ctx, err
+		}
+
 		if shouldProvisionCluster {
 			if err = provisioner.DeleteCluster(ctx, cfg); err != nil {
 				return ctx, err