From 0b501dd23901ade4d42c8c0beb5f0f18f2c3c70c Mon Sep 17 00:00:00 2001
From: runseb <runseb@gmail.com>
Date: Wed, 30 Mar 2016 22:04:10 +0200
Subject: [PATCH 1/3] move old DM install to helm namespace and helm app label

---
 pkg/client/install.go | 50 +++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkg/client/install.go b/pkg/client/install.go
index ad14c9882..379dc6025 100644
--- a/pkg/client/install.go
+++ b/pkg/client/install.go
@@ -73,7 +73,7 @@ func (i *Installer) expand() ([]byte, error) {
 func IsInstalled(runner kubectl.Runner) bool {
 	// Basically, we test "all-or-nothing" here: if this returns without error
 	// we know that we have both the namespace and the manager API server.
-	out, err := runner.GetByKind("rc", "manager-rc", "dm")
+	out, err := runner.GetByKind("rc", "manager-rc", "helm")
 	if err != nil {
 		format.Err("Installation not found: %s %s", out, err)
 		return false
@@ -101,44 +101,44 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    app: dm
-    name: dm-namespace
-  name: dm
+    app: helm
+    name: helm-namespace
+  name: helm
 ---
 apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: dm
+    app: helm
     name: expandybird-service
   name: expandybird-service
-  namespace: dm
+  namespace: helm
 spec:
   ports:
   - name: expandybird
     port: 8081
     targetPort: 8080
   selector:
-    app: dm
+    app: helm
     name: expandybird
 ---
 apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    app: dm
+    app: helm
     name: expandybird-rc
   name: expandybird-rc
-  namespace: dm
+  namespace: helm
 spec:
   replicas: 2
   selector:
-    app: dm
+    app: helm
     name: expandybird
   template:
     metadata:
       labels:
-        app: dm
+        app: helm
         name: expandybird
     spec:
       containers:
@@ -153,36 +153,36 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: dm
+    app: helm
     name: resourcifier-service
   name: resourcifier-service
-  namespace: dm
+  namespace: helm
 spec:
   ports:
   - name: resourcifier
     port: 8082
     targetPort: 8080
   selector:
-    app: dm
+    app: helm
     name: resourcifier
 ---
 apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    app: dm
+    app: helm
     name: resourcifier-rc
   name: resourcifier-rc
-  namespace: dm
+  namespace: helm
 spec:
   replicas: 2
   selector:
-    app: dm
+    app: helm
     name: resourcifier
   template:
     metadata:
       labels:
-        app: dm
+        app: helm
         name: resourcifier
     spec:
       containers:
@@ -197,36 +197,36 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: dm
+    app: helm
     name: manager-service
   name: manager-service
-  namespace: dm
+  namespace: helm
 spec:
   ports:
   - name: manager
     port: 8080
     targetPort: 8080
   selector:
-    app: dm
+    app: helm
     name: manager
 ---
 apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    app: dm
+    app: helm
     name: manager-rc
   name: manager-rc
-  namespace: dm
+  namespace: helm
 spec:
   replicas: 1
   selector:
-    app: dm
+    app: helm
     name: manager
   template:
     metadata:
       labels:
-        app: dm
+        app: helm
         name: manager
     spec:
       containers:

From 914a341e3a62b64f85d58e7df64a99e4600f0fc7 Mon Sep 17 00:00:00 2001
From: runseb <runseb@gmail.com>
Date: Thu, 31 Mar 2016 08:56:36 +0200
Subject: [PATCH 2/3] Use helm namespace in uninstall method

---
 pkg/client/uninstall.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/client/uninstall.go b/pkg/client/uninstall.go
index 81e3c6373..d6a23702b 100644
--- a/pkg/client/uninstall.go
+++ b/pkg/client/uninstall.go
@@ -25,6 +25,6 @@ import (
 // Returns the string output received from the operation, and an error if the
 // command failed.
 func Uninstall(runner kubectl.Runner) (string, error) {
-	o, err := runner.Delete("dm", "Namespace")
+	o, err := runner.Delete("helm", "Namespace")
 	return string(o), err
 }

From 75ded56fb501977694dd3e889efa87e75f7a3edd Mon Sep 17 00:00:00 2001
From: runseb <runseb@gmail.com>
Date: Thu, 31 Mar 2016 10:20:05 +0200
Subject: [PATCH 3/3] fix namespace for helm server status

---
 cmd/helm/server.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/helm/server.go b/cmd/helm/server.go
index ffd0f876e..ee902da40 100644
--- a/cmd/helm/server.go
+++ b/cmd/helm/server.go
@@ -162,7 +162,7 @@ func statusServer(c *cli.Context) error {
 	kubectlPath := c.GlobalString("kubectl")
 	runner := buildKubectlRunner(kubectlPath, dryRun)
 
-	out, err := runner.GetByKind("pods", "", "dm")
+	out, err := runner.GetByKind("pods", "", "helm")
 	if err != nil {
 		return err
 	}