Merge pull request #1 from whitmo/new-cadvisor-port

Change cadvisor port and point kubelet to find it

cluster/juju/charms/trusty/kubernetes/files/cadvisor.upstart.tmpl

@@ -11,6 +11,6 @@ exec docker run \
   --volume=/var/run:/var/run:rw \
   --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro \
   --volume=/var/lib/docker/:/var/lib/docker:ro \
-  --publish=127.0.0.1:4194:8080 \
+  --publish=127.0.0.1:4193:8080 \
   --name=cadvisor \
   google/cadvisor:latest

cluster/juju/charms/trusty/kubernetes/files/kubelet.upstart.tmpl

@@ -11,4 +11,5 @@ exec /usr/local/bin/kubelet \
      --address=%(kubelet_bind_addr)s \
      --api_servers=%(kubeapi_server)s \
      --hostname_override=%(kubelet_bind_addr)s \
+     --cadvisor_port=4193
      --logtostderr=true

cluster/juju/charms/trusty/kubernetes/hooks/hooks.py

@@ -78,7 +78,7 @@ def relation_changed():
     # Setup kubernetes supplemental group
     setup_kubernetes_group()
 
-    # Register services
+    # Register upstart managed services
     for n in ("cadvisor", "kubelet", "proxy"):
         if render_upstart(n, template_data) or not host.service_running(n):
             print("Starting %s" % n)