diff --git a/cmd/helm/server.go b/cmd/helm/server.go index ffd0f876e3295ba7d4638f924456a8e039c38eec..ee902da40a94bf4f7f461be7b1b5aa3f2c931d09 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 } diff --git a/pkg/client/install.go b/pkg/client/install.go index ad14c98823bf78fca785c95504e7249e2a982483..379dc60250ab7c67348be912a6b86f5c0f2a5bc1 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: diff --git a/pkg/client/uninstall.go b/pkg/client/uninstall.go index 81e3c637303620d24a2309f468ad5fab56c3d15f..d6a23702bf1df9da6cbfa40ab3c6b6044e982545 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 }