Commit 2c3d45d1 authored by Matt Butcher's avatar Matt Butcher Committed by GitHub

Merge pull request #1017 from pwittrock/deploy

Switch from rc to deployment for running tiller
parents 19a7127c 49644678
...@@ -66,19 +66,13 @@ func Install(namespace, image string, verbose bool) error { ...@@ -66,19 +66,13 @@ func Install(namespace, image string, verbose bool) error {
// InstallYAML is the installation YAML for DM. // InstallYAML is the installation YAML for DM.
const InstallYAML = ` const InstallYAML = `
--- ---
apiVersion: v1 apiVersion: extensions/v1beta1
kind: ReplicationController kind: Deployment
metadata: metadata:
labels: name: tiller-deploy
app: helm
name: tiller
name: tiller-rc
namespace: {{ .Namespace }} namespace: {{ .Namespace }}
spec: spec:
replicas: 1 replicas: 1
selector:
app: helm
name: tiller
template: template:
metadata: metadata:
labels: labels:
......
...@@ -51,7 +51,7 @@ func (c *Client) ForwardPort(namespace, podName string, remote int) (*Tunnel, er ...@@ -51,7 +51,7 @@ func (c *Client) ForwardPort(namespace, podName string, remote int) (*Tunnel, er
} }
// Build a url to the portforward endpoing // 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(). u := client.RESTClient.Post().
Resource("pods"). Resource("pods").
Namespace(namespace). Namespace(namespace).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment