Move deploy tests into a test namespace too instead of default

Author: creydr

test/e2e/bundle_test.go

@@ -109,7 +109,7 @@ var _ = Describe("Bundle", Label("bundle"), Ordered, func() {
 				_, _ = fmt.Fprint(GinkgoWriter, out)
 
 				By("Cleanup resources")
-				cleanupNamespaces(testNamespaces)
+				cleanupTestNamespaces(testNamespaces...)
 			}
 		})
 
@@ -147,7 +147,7 @@ var _ = Describe("Bundle", Label("bundle"), Ordered, func() {
 				_, _ = fmt.Fprint(GinkgoWriter, out)
 
 				By("Cleanup resources")
-				cleanupNamespaces(testNamespaces)
+				cleanupTestNamespaces(testNamespaces...)
 			}
 		})
 
@@ -187,7 +187,7 @@ var _ = Describe("Bundle", Label("bundle"), Ordered, func() {
 				_, _ = fmt.Fprint(GinkgoWriter, out)
 
 				By("Cleanup resources")
-				cleanupNamespaces(testNamespaces)
+				cleanupTestNamespaces(testNamespaces...)
 			}
 		})
 
@@ -244,7 +244,7 @@ var _ = Describe("Bundle", Label("bundle"), Ordered, func() {
 				_, _ = fmt.Fprint(GinkgoWriter, out)
 
 				By("Cleanup resources")
-				cleanupNamespaces(testNamespaces)
+				cleanupTestNamespaces(testNamespaces...)
 			}
 		})
 
@@ -284,7 +284,7 @@ var _ = Describe("Bundle", Label("bundle"), Ordered, func() {
 				_, _ = fmt.Fprint(GinkgoWriter, out)
 
 				By("Cleanup resources")
-				cleanupNamespaces(testNamespaces)
+				cleanupTestNamespaces(testNamespaces...)
 			}
 		})
 
@@ -410,10 +410,17 @@ func createMultipleNamespaceAndDeployFunction(count int) []TestNamespace {
 	return testNamespaces
 }
 
-func cleanupNamespaces(testNamespaces []TestNamespace) {
-	By("Cleaning up all resources")
+func cleanupTestNamespaces(testNamespaces ...TestNamespace) {
+	By("Cleaning up test namespaces resources")
 	for _, testNs := range testNamespaces {
-		cmd := exec.Command("kubectl", "delete", "namespace", testNs.Name, "--ignore-not-found")
+		cleanupNamespaces(testNs.Name)
+	}
+}
+
+func cleanupNamespaces(namespaces ...string) {
+	for _, ns := range namespaces {
+		By("Cleaning up namespace " + ns)
+		cmd := exec.Command("kubectl", "delete", "namespace", ns, "--ignore-not-found")
 		_, err := utils.Run(cmd)
 		Expect(err).NotTo(HaveOccurred())
 	}

test/e2e/func_deploy_test.go

@@ -58,8 +58,13 @@ var _ = Describe("Operator", func() {
 			Expect(err).NotTo(HaveOccurred())
 			DeferCleanup(os.RemoveAll, repoDir)
 
+			functionNamespace, err = utils.GetTestNamespace()
+			Expect(err).NotTo(HaveOccurred())
+			DeferCleanup(cleanupNamespaces, functionNamespace)
+
 			// Deploy function using func CLI
 			cmd := exec.Command("func", "deploy",
+				"--namespace", functionNamespace,
 				"--path", repoDir,
 				"--registry", registry,
 				"--registry-insecure", strconv.FormatBool(registryInsecure))
@@ -69,7 +74,7 @@ var _ = Describe("Operator", func() {
 
 			// Cleanup func deployment
 			DeferCleanup(func() {
-				cmd := exec.Command("func", "delete", "--path", repoDir)
+				cmd := exec.Command("func", "delete", "--path", repoDir, "--namespace", functionNamespace)
 				_, _ = utils.Run(cmd)
 			})
 
@@ -114,7 +119,7 @@ var _ = Describe("Operator", func() {
 			function := &functionsdevv1alpha1.Function{
 				ObjectMeta: metav1.ObjectMeta{
 					GenerateName: "my-function-",
-					Namespace:    "default",
+					Namespace:    functionNamespace,
 				},
 				Spec: functionsdevv1alpha1.FunctionSpec{
 					Source: functionsdevv1alpha1.FunctionSpecSource{
@@ -131,7 +136,6 @@ var _ = Describe("Operator", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			functionName = function.Name
-			functionNamespace = function.Namespace
 
 			funcBecomeReady := func(g Gomega) {
 				fn := &functionsdevv1alpha1.Function{}
@@ -172,6 +176,10 @@ var _ = Describe("Operator", func() {
 			repoDir, err = InitializeRepoWithFunction(repoURL, username, password, "go")
 			Expect(err).NotTo(HaveOccurred())
 			DeferCleanup(os.RemoveAll, repoDir)
+
+			functionNamespace, err = utils.GetTestNamespace()
+			Expect(err).NotTo(HaveOccurred())
+			DeferCleanup(cleanupNamespaces, functionNamespace)
 		})
 
 		AfterEach(func() {
@@ -188,7 +196,7 @@ var _ = Describe("Operator", func() {
 			function := &functionsdevv1alpha1.Function{
 				ObjectMeta: metav1.ObjectMeta{
 					GenerateName: "my-undeployed-function-",
-					Namespace:    "default",
+					Namespace:    functionNamespace,
 				},
 				Spec: functionsdevv1alpha1.FunctionSpec{
 					Source: functionsdevv1alpha1.FunctionSpecSource{
@@ -205,7 +213,6 @@ var _ = Describe("Operator", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			functionName = function.Name
-			functionNamespace = function.Namespace
 
 			funcBecomeReady := func(g Gomega) {
 				fn := &functionsdevv1alpha1.Function{}