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

[docker_daemon] catch exception when getting k8s labels fails #2200

Merged
merged 1 commit into from
Jan 14, 2016

Conversation

hkaj
Copy link
Member

@hkaj hkaj commented Jan 13, 2016

When a user misconfigures their kubernetes check, it make the docker check fails too. This PR modifies the behavior so that we just log a warning and omit the kubernetes tags.

@yannmh
Copy link
Member

yannmh commented Jan 13, 2016

👍

@olivielpeau olivielpeau added this to the 5.7.0 milestone Jan 13, 2016
@remh
Copy link

remh commented Jan 13, 2016

Let's add the exception message in the log at least.

@hkaj hkaj force-pushed the haissam/docker-catch-k8s-error branch from aa39c48 to 802ae75 Compare January 14, 2016 12:47
hkaj added a commit that referenced this pull request Jan 14, 2016
[docker_daemon] catch exception when getting k8s labels fails
@hkaj hkaj merged commit 2af0cec into master Jan 14, 2016
@hkaj hkaj deleted the haissam/docker-catch-k8s-error branch January 14, 2016 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants