Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use docker hostname instead of default route to query cadvisor & kubelet #2609

Merged
merged 3 commits into from
Jun 22, 2016

Conversation

hkaj
Copy link
Member

@hkaj hkaj commented Jun 16, 2016

Using the default route works fine in most cases, but if the user has a virtual network set up (like Calico) it won't point to the real host.
The docker host name is more reliable.

_get_default_router is not used anywhere else, so I killed it.

@hkaj hkaj added this to the 5.8.3 milestone Jun 16, 2016
@hkaj hkaj force-pushed the haissam/fix-get-host-in-kubeutil branch from 69f145a to cc852d0 Compare June 17, 2016 13:07
@truthbk
Copy link
Member

truthbk commented Jun 21, 2016

Looks good to me. Please squash before merging! Also, let's let CI go 💚 before merging. 👍

@truthbk
Copy link
Member

truthbk commented Jun 22, 2016

@hkaj 👍 for the test fixes! Nice.

@hkaj hkaj merged commit c82a3d3 into master Jun 22, 2016
@hkaj hkaj deleted the haissam/fix-get-host-in-kubeutil branch June 22, 2016 15:52
gmmeyer pushed a commit that referenced this pull request Jun 23, 2016
…let (#2609)

* Use docker hostname instead of default route to query cadvisor & kubelet
* remove is_dockerized condition from DockerUtil get_hostname
degemer pushed a commit that referenced this pull request Jul 6, 2016
…let (#2609)

* Use docker hostname instead of default route to query cadvisor & kubelet
* remove is_dockerized condition from DockerUtil get_hostname
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants