github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Change cadvisor port and point kubelet to find it
This commit is contained in:
Matt Bruzek 2015-04-20 17:17:18 -05:00
commit f201379938
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/juju/charms/trusty/kubernetes/files/cadvisor.upstart.tmpl
View File

@ -11,6 +11,6 @@ exec docker run \
--volume=/var/run:/var/run:rw \ --volume=/var/run:/var/run:rw \
--volume=/sys/fs/cgroup:/sys/fs/cgroup:ro \ --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro \
--volume=/var/lib/docker/:/var/lib/docker: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 \ --name=cadvisor \
google/cadvisor:latest google/cadvisor:latest

1
cluster/juju/charms/trusty/kubernetes/files/kubelet.upstart.tmpl
View File

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

2
cluster/juju/charms/trusty/kubernetes/hooks/hooks.py
View File

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