From 4de48613e7a708dc2e4d4e543f39c901683b46d5 Mon Sep 17 00:00:00 2001 From: Victor Marmol Date: Thu, 31 Jul 2014 13:14:00 -0700 Subject: [PATCH] Change cAdvisor port to 4194. This is so it doesn't conflict with the default registry address of 5000. --- cluster/saltbase/salt/cadvisor/cadvisor.manifest | 2 +- cmd/kubelet/kubelet.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/saltbase/salt/cadvisor/cadvisor.manifest b/cluster/saltbase/salt/cadvisor/cadvisor.manifest index a6d01ef15c..18827e1dbf 100644 --- a/cluster/saltbase/salt/cadvisor/cadvisor.manifest +++ b/cluster/saltbase/salt/cadvisor/cadvisor.manifest @@ -6,7 +6,7 @@ containers: ports: - name: http containerPort: 8080 - hostPort: 5000 + hostPort: 4194 volumeMounts: - name: varrun mountPath: /var/run diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go index 839085c270..085a4425e9 100644 --- a/cmd/kubelet/kubelet.go +++ b/cmd/kubelet/kubelet.go @@ -105,7 +105,7 @@ func main() { glog.Fatal("Couldn't connect to docker.") } - cadvisorClient, err := cadvisor.NewClient("http://127.0.0.1:5000") + cadvisorClient, err := cadvisor.NewClient("http://127.0.0.1:4194") if err != nil { glog.Errorf("Error on creating cadvisor client: %v", err) }