Merge pull request #164 from kadel/up-in-namespace

kompose up - Get namespace from kubeconfig
kubernetes · Sep 26, 2016 · 9dbc5c0 · 9dbc5c0
2 parents fa46376 + 16ca1aa
commit 9dbc5c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/cli/app/app.go b/cli/app/app.go
@@ -28,8 +28,9 @@ import (
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	// install kubernetes api
+	// install OpenShift apis
 	_ "github.com/openshift/origin/pkg/deploy/api/install"
+
 	"github.com/skippbox/kompose/pkg/kobject"
 	"github.com/skippbox/kompose/pkg/loader"
 	"github.com/skippbox/kompose/pkg/loader/bundle"
@@ -186,6 +187,10 @@ func Up(c *cli.Context) {
 	if err != nil {
 		logrus.Fatalf("Failed to access the Kubernetes cluster. Make sure you have a Kubernetes cluster running: %v", err)
 	}
+	namespace, _, err := factory.DefaultNamespace()
+	if err != nil {
+		logrus.Fatalf("Failed to get Namespace")
+	}
 	client := client.NewOrDie(clientConfig)
 
 	inputFile := c.GlobalString("file")
@@ -226,7 +231,7 @@ func Up(c *cli.Context) {
 	objects := t.Transform(komposeObject, opt)
 
 	//Submit objects to K8s endpoint
-	kubernetes.CreateObjects(client, objects)
+	kubernetes.CreateObjects(client, namespace, objects)
 }
 
 // Down deletes all deployment, svc.

diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go
@@ -32,8 +32,9 @@ import (
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util/intstr"
 	//"k8s.io/kubernetes/pkg/controller/daemon"
-	"k8s.io/kubernetes/pkg/kubectl"
 	"time"
+
+	"k8s.io/kubernetes/pkg/kubectl"
 )
 
 type Kubernetes struct {
@@ -280,17 +281,17 @@ func UpdateController(obj runtime.Object, updateTemplate func(*api.PodTemplateSp
 }
 
 // Submit deployment and svc to k8s endpoint
-func CreateObjects(client *client.Client, objects []runtime.Object) {
+func CreateObjects(client *client.Client, namespace string, objects []runtime.Object) {
 	for _, v := range objects {
 		switch t := v.(type) {
 		case *extensions.Deployment:
-			_, err := client.Deployments(api.NamespaceDefault).Create(t)
+			_, err := client.Deployments(namespace).Create(t)
 			if err != nil {
 				logrus.Fatalf("Error: '%v' while creating deployment: %s", err, t.Name)
 			}
 			logrus.Infof("Successfully created deployment: %s", t.Name)
 		case *api.Service:
-			_, err := client.Services(api.NamespaceDefault).Create(t)
+			_, err := client.Services(namespace).Create(t)
 			if err != nil {
 				logrus.Fatalf("Error: '%v' while creating service: %s", err, t.Name)
 			}