From 907936c2cef37bb6864213e878f6c7cec5821d83 Mon Sep 17 00:00:00 2001
From: Adam Reese <adam@reese.io>
Date: Wed, 22 Jun 2016 12:44:45 -0700
Subject: [PATCH] fix(tunnel): handle blank namespace

---
 cmd/helm/tunnel.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/cmd/helm/tunnel.go b/cmd/helm/tunnel.go
index abf7fe401..070c1515e 100644
--- a/cmd/helm/tunnel.go
+++ b/cmd/helm/tunnel.go
@@ -13,13 +13,23 @@ import (
 var tunnel *kube.Tunnel
 
 func newTillerPortForwarder(namespace string) (*kube.Tunnel, error) {
+	kc := kube.New(nil)
+
+	if namespace == "" {
+		ns, _, err := kc.DefaultNamespace()
+		if err != nil {
+			return nil, err
+		}
+		namespace = ns
+	}
+
 	podName, err := getTillerPodName(namespace)
 	if err != nil {
 		return nil, err
 	}
 	// FIXME use a constain that is accessible on init
 	const tillerPort = 44134
-	return kube.New(nil).ForwardPort(namespace, podName, tillerPort)
+	return kc.ForwardPort(namespace, podName, tillerPort)
 }
 
 func getTillerPodName(namespace string) (string, error) {