From 49644678689532062b16249c308f8f2113126b48 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Tue, 2 Aug 2016 13:04:22 -0700 Subject: [PATCH] Swtich from rc to deployment for running tiller --- pkg/client/install.go | 12 +++--------- pkg/kube/tunnel.go | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkg/client/install.go b/pkg/client/install.go index 1ffbb5b77..0b7a3b1fc 100644 --- a/pkg/client/install.go +++ b/pkg/client/install.go @@ -66,19 +66,13 @@ func Install(namespace, image string, verbose bool) error { // InstallYAML is the installation YAML for DM. const InstallYAML = ` --- -apiVersion: v1 -kind: ReplicationController +apiVersion: extensions/v1beta1 +kind: Deployment metadata: - labels: - app: helm - name: tiller - name: tiller-rc + name: tiller-deploy namespace: {{ .Namespace }} spec: replicas: 1 - selector: - app: helm - name: tiller template: metadata: labels: diff --git a/pkg/kube/tunnel.go b/pkg/kube/tunnel.go index ff3b76b42..66406d512 100644 --- a/pkg/kube/tunnel.go +++ b/pkg/kube/tunnel.go @@ -51,7 +51,7 @@ func (c *Client) ForwardPort(namespace, podName string, remote int) (*Tunnel, er } // Build a url to the portforward endpoing - // example: http://localhost:8080/api/v1/namespaces/helm/pods/tiller-rc-9itlq/portforward + // example: http://localhost:8080/api/v1/namespaces/helm/pods/tiller-deploy-9itlq/portforward u := client.RESTClient.Post(). Resource("pods"). Namespace(namespace).