Make namespace arg optional for RunFuncDeploy()

Author: creydr

test/e2e/bundle_test.go

@@ -363,7 +363,7 @@ func createNamespaceAndDeployFunction() TestNamespace {
 	DeferCleanup(os.RemoveAll, repoDir)
 
 	// Deploy function
-	out, err := utils.RunFuncDeploy(repoDir, ns)
+	out, err := utils.RunFuncDeploy(repoDir, utils.WithNamespace(ns))
 	Expect(err).NotTo(HaveOccurred())
 	_, _ = fmt.Fprint(GinkgoWriter, out)
 

test/e2e/func_deploy_test.go

@@ -154,7 +154,7 @@ var _ = Describe("Operator", func() {
 			DeferCleanup(cleanupNamespaces, functionNamespace)
 
 			// Deploy function using func CLI
-			out, err := utils.RunFuncDeploy(repoDir, functionNamespace)
+			out, err := utils.RunFuncDeploy(repoDir, utils.WithNamespace(functionNamespace))
 			Expect(err).NotTo(HaveOccurred())
 			_, _ = fmt.Fprint(GinkgoWriter, out)
 
@@ -235,7 +235,7 @@ var _ = Describe("Operator", func() {
 			functionDir := filepath.Join(repoDir, subPath)
 
 			// Deploy function using func CLI
-			out, err := utils.RunFuncDeploy(functionDir, functionNamespace)
+			out, err := utils.RunFuncDeploy(functionDir, utils.WithNamespace(functionNamespace))
 			Expect(err).NotTo(HaveOccurred())
 			_, _ = fmt.Fprint(GinkgoWriter, out)
 
@@ -375,7 +375,7 @@ var _ = Describe("Operator", func() {
 			DeferCleanup(cleanupNamespaces, functionNamespace)
 
 			// Deploy function using func CLI
-			out, err := utils.RunFuncDeploy(repoDir, functionNamespace)
+			out, err := utils.RunFuncDeploy(repoDir, utils.WithNamespace(functionNamespace))
 			Expect(err).NotTo(HaveOccurred())
 			_, _ = fmt.Fprint(GinkgoWriter, out)
 

test/utils/func.go

@@ -34,7 +34,7 @@ func RunFunc(command string, args ...string) (string, error) {
 }
 
 // RunFuncDeploy runs func deploy
-func RunFuncDeploy(functionDir, functionNamespace string, optFns ...FuncDeployOption) (string, error) {
+func RunFuncDeploy(functionDir string, optFns ...FuncDeployOption) (string, error) {
 	opts := &FuncDeployOptions{
 		// defaults
 		Registry:         Registry(),
@@ -46,12 +46,15 @@ func RunFuncDeploy(functionDir, functionNamespace string, optFns ...FuncDeployOp
 	}
 
 	args := []string{
-		"--namespace", functionNamespace,
 		"--path", functionDir,
 		"--registry", opts.Registry,
 		fmt.Sprintf("--registry-insecure=%t", opts.RegistryInsecure),
 	}
 
+	if opts.Namespace != "" {
+		args = append(args, "--namespace", opts.Namespace)
+	}
+
 	if opts.Builder != "" {
 		args = append(args, "--builder", opts.Builder)
 	}
@@ -79,12 +82,19 @@ func RunFuncWithVersion(version string, command string, args ...string) (string,
 type FuncDeployOptions struct {
 	Registry         string
 	RegistryInsecure bool
+	Namespace        string
 	Builder          string
 	Deployer         string
 }
 
 type FuncDeployOption func(*FuncDeployOptions)
 
+func WithNamespace(namespace string) FuncDeployOption {
+	return func(opts *FuncDeployOptions) {
+		opts.Namespace = namespace
+	}
+}
+
 func WithBuilder(builder string) FuncDeployOption {
 	return func(o *FuncDeployOptions) {
 		o.Builder = builder