add namespace flag for kudo init (#903)

pkg/kudoctl/cmd/init.go

@@ -58,6 +58,7 @@ type initCmd struct {
 	dryRun     bool
 	output     string
 	version    string
+	ns         string
 	wait       bool
 	timeout    int64
 	clientOnly bool
@@ -82,6 +83,7 @@ func newInitCmd(fs afero.Fs, out io.Writer) *cobra.Command {
 				return err
 			}
 			i.home = Settings.Home
+			i.ns = Settings.Namespace
 			clog.V(8).Printf("init cmd %v", i)
 			return i.run()
 		},
@@ -122,7 +124,7 @@ func (initCmd *initCmd) validate(flags *flag.FlagSet) error {
 
 // run initializes local config and installs KUDO manager to Kubernetes cluster.
 func (initCmd *initCmd) run() error {
-	opts := cmdInit.NewOptions(initCmd.version)
+	opts := cmdInit.NewOptions(initCmd.version, initCmd.ns)
 	// if image provided switch to it.
 	if initCmd.image != "" {
 		opts.Image = initCmd.image

pkg/kudoctl/cmd/init/manager.go

@@ -43,15 +43,18 @@ type Options struct {
 }
 
 // NewOptions provides an option struct with defaults
-func NewOptions(v string) Options {
+func NewOptions(v string, ns string) Options {
 
 	if v == "" {
 		v = version.Get().GitVersion
 	}
+	if ns == "" {
+		ns = defaultns
+	}
 
 	return Options{
 		Version:                       v,
-		Namespace:                     defaultns,
+		Namespace:                     ns,
 		TerminationGracePeriodSeconds: defaultGracePeriod,
 		Image:                         fmt.Sprintf("kudobuilder/controller:v%v", v),
 	}

pkg/kudoctl/cmd/init_integration_test.go

@@ -5,6 +5,7 @@ package cmd
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"log"
 	"os"
 	"strings"
@@ -19,6 +20,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -77,6 +79,56 @@ func TestIntegInitForCRDs(t *testing.T) {
 	assert.Nil(t, testClient.Create(context.TODO(), instance))
 }
 
+func TestIntegInitWithNameSpace(t *testing.T) {
+	namespace := "integration-test"
+	// Kubernetes client caches the types, se we need to re-initialize it.
+	testClient, err := testutils.NewRetryClient(testenv.Config, client.Options{
+		Scheme: testutils.Scheme(),
+	})
+	assert.Nil(t, err)
+	kclient := getKubeClient(t)
+
+	instance := testutils.NewResource("kudo.dev/v1alpha1", "Instance", "zk", "ns")
+	// Verify that we cannot create the instance, because the test environment is empty.
+	assert.IsType(t, &meta.NoKindMatchError{}, testClient.Create(context.TODO(), instance))
+
+	// Install all of the CRDs.
+	crds := cmdinit.CRDs()
+	defer deleteInitObjects(testClient)
+
+	var buf bytes.Buffer
+	cmd := &initCmd{
+		out:    &buf,
+		fs:     afero.NewMemMapFs(),
+		client: kclient,
+		ns:     namespace,
+	}
+	err = cmd.run()
+	assert.Nil(t, err)
+
+	// WaitForCRDs to be created... the init cmd did NOT wait
+	assert.Nil(t, testutils.WaitForCRDs(testenv.DiscoveryClient, crds))
+
+	// Kubernetes client caches the types, so we need to re-initialize it.
+	testClient, err = testutils.NewRetryClient(testenv.Config, client.Options{
+		Scheme: testutils.Scheme(),
+	})
+	assert.Nil(t, err)
+	kclient = getKubeClient(t)
+
+	// make sure that the controller lives in the correct namespace
+	statefulsets, err := kclient.KubeClient.AppsV1().StatefulSets(namespace).List(metav1.ListOptions{})
+	assert.Nil(t, err)
+
+	kudoControllerFound := false
+	for _, ss := range statefulsets.Items {
+		if ss.Name == "kudo-controller-manager" {
+			kudoControllerFound = true
+		}
+	}
+	assert.True(t, kudoControllerFound, fmt.Sprintf("No kudo-controller-manager statefulset found in namespace %s", namespace))
+}
+
 func TestNoErrorOnReInit(t *testing.T) {
 	//	 if the CRD exists and we init again there should be no error
 	testClient, err := testutils.NewRetryClient(testenv.Config, client.Options{
@@ -124,7 +176,7 @@ func TestNoErrorOnReInit(t *testing.T) {
 
 func deleteInitObjects(client *testutils.RetryClient) {
 	crds := cmdinit.CRDs()
-	prereqs := cmdinit.Prereq(cmdinit.NewOptions(""))
+	prereqs := cmdinit.Prereq(cmdinit.NewOptions("", ""))
 	deleteCRDs(crds, client)
 	deletePrereq(prereqs, client)
 }