namespace fix

Author: barkhachoithani

test/e2e/3_ml_cluster_ednode_test.go

@@ -23,6 +23,7 @@ import (
 const (
 	dnodeGrpName = "dnode"
 	enodeGrpName = "enode"
+	mlClusterNs  = "ednode"
 )
 
 var (
@@ -58,7 +59,7 @@ var (
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "mlclusterednode",
-			Namespace: mlNamespace,
+			Namespace: mlClusterNs,
 		},
 		Spec: databasev1alpha1.MarklogicClusterSpec{
 			Image: marklogicImage,
@@ -77,9 +78,17 @@ func TestMlClusterWithEdnode(t *testing.T) {
 	// Setup for MarklogicCluster creation
 	feature.Setup(func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
 		client := c.Client()
-		databasev1alpha1.AddToScheme(client.Resources(mlNamespace).GetScheme())
+		namespace := &corev1.Namespace{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: mlClusterNs,
+			},
+		}
+		if err := client.Resources().Create(ctx, namespace); err != nil {
+			t.Fatalf("Failed to create namespace: %s", err)
+		}
+		databasev1alpha1.AddToScheme(client.Resources(mlClusterNs).GetScheme())
 
-		if err := client.Resources(mlNamespace).Create(ctx, mlcluster); err != nil {
+		if err := client.Resources(mlClusterNs).Create(ctx, mlcluster); err != nil {
 			t.Fatalf("Failed to create MarklogicCluster: %s", err)
 		}
 		// wait for resource to be created
@@ -99,7 +108,7 @@ func TestMlClusterWithEdnode(t *testing.T) {
 	feature.Assess("MarklogicCluster with 2 MarkLogicGroups deployed Ok", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
 		client := c.Client()
 		var mlcluster databasev1alpha1.MarklogicCluster
-		if err := client.Resources().Get(ctx, "mlclusterednode", mlNamespace, &mlcluster); err != nil {
+		if err := client.Resources().Get(ctx, "mlclusterednode", mlClusterNs, &mlcluster); err != nil {
 			t.Log("====MarklogicCluster not found====")
 			t.Fatal(err)
 		}
@@ -110,12 +119,12 @@ func TestMlClusterWithEdnode(t *testing.T) {
 		client := c.Client()
 
 		podName := "dnode-0"
-		err := utils.WaitForPod(ctx, t, client, mlNamespace, podName, 90*time.Second)
+		err := utils.WaitForPod(ctx, t, client, mlClusterNs, podName, 90*time.Second)
 		if err != nil {
 			t.Fatalf("Failed to wait for pod creation: %v", err)
 		}
 		epodName := "enode-0"
-		err = utils.WaitForPod(ctx, t, client, mlNamespace, epodName, 150*time.Second)
+		err = utils.WaitForPod(ctx, t, client, mlClusterNs, epodName, 150*time.Second)
 		if err != nil {
 			t.Fatalf("Failed to wait for pod creation: %v", err)
 		}
@@ -129,7 +138,7 @@ func TestMlClusterWithEdnode(t *testing.T) {
 		url := "http://localhost:8002/manage/v2/groups"
 		curlCommand := fmt.Sprintf("curl %s -u %s:%s", url, adminUsername, adminPassword)
 
-		output, err := utils.ExecCurlInPod(podName, mlNamespace, containerName, curlCommand)
+		output, err := utils.ExecCmdInPod(podName, mlClusterNs, containerName, curlCommand)
 		if err != nil {
 			t.Fatalf("Failed to execute curl command in pod: %v", err)
 		}
@@ -143,7 +152,7 @@ func TestMlClusterWithEdnode(t *testing.T) {
 	feature.Setup(func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
 		client := c.Client()
 		var mlcluster databasev1alpha1.MarklogicCluster
-		if err := client.Resources().Get(ctx, "mlclusterednode", mlNamespace, &mlcluster); err != nil {
+		if err := client.Resources().Get(ctx, "mlclusterednode", mlClusterNs, &mlcluster); err != nil {
 			t.Fatal(err)
 		}
 		// Scale the MarkLogic groups to 2
@@ -158,12 +167,12 @@ func TestMlClusterWithEdnode(t *testing.T) {
 	feature.Assess("New Pods created", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
 		client := c.Client()
 		podNameOne := "dnode-1"
-		err := utils.WaitForPod(ctx, t, client, mlNamespace, podNameOne, 60*time.Second)
+		err := utils.WaitForPod(ctx, t, client, mlClusterNs, podNameOne, 60*time.Second)
 		if err != nil {
 			t.Fatalf("Failed to wait for pod %s creation: %v", podNameOne, err)
 		}
 		epodNameTwo := "enode-1"
-		err = utils.WaitForPod(ctx, t, client, mlNamespace, epodNameTwo, 120*time.Second)
+		err = utils.WaitForPod(ctx, t, client, mlClusterNs, epodNameTwo, 120*time.Second)
 		if err != nil {
 			t.Fatalf("Failed to wait for pod %s creation: %v", epodNameTwo, err)
 		}
@@ -175,6 +184,7 @@ func TestMlClusterWithEdnode(t *testing.T) {
 		podList := &corev1.PodList{}
 		if err := client.Resources().List(ctx, podList, func(lo *metav1.ListOptions) {
 			lo.LabelSelector = "app.kubernetes.io/name=marklogic"
+			lo.FieldSelector = "metadata.namespace=" + mlClusterNs
 		}); err != nil {
 			t.Fatal(err)
 		}
@@ -189,6 +199,13 @@ func TestMlClusterWithEdnode(t *testing.T) {
 
 	// Using feature.Teardown to clean up
 	feature.Teardown(func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
+		client := c.Client()
+		if err := client.Resources(mlClusterNs).Delete(ctx, mlcluster); err != nil {
+			t.Fatalf("Failed to delete MarklogicCluster: %s", err)
+		}
+		if err := client.Resources().Delete(ctx, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: mlClusterNs}}); err != nil {
+			t.Fatalf("Failed to delete namespace: %s", err)
+		}
 		return ctx
 	})
 

test/utils/utils.go

@@ -196,8 +196,8 @@ func GetSecretData(config *rest.Config, namespace, secretName string) (string, s
 	return string(username), string(password), nil
 }
 
-func ExecCurlInPod(podName, namespace, containerName, curlCommand string) (string, error) {
-	cmd := exec.Command("kubectl", "exec", podName, "-n", namespace, "-c", containerName, "--", "sh", "-c", curlCommand)
+func ExecCmdInPod(podName, namespace, containerName, command string) (string, error) {
+	cmd := exec.Command("kubectl", "exec", podName, "-n", namespace, "-c", containerName, "--", "sh", "-c", command)
 
 	var out bytes.Buffer
 	var stderr bytes.Buffer