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.

Sign up for GitHub

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

Jump to bottom

[k8s/docker] Better support of kubernetes >= 1.2 #2512

Merged
merged 1 commit into from
May 18, 2016
Merged

[k8s/docker] Better support of kubernetes >= 1.2 #2512

merged 1 commit into from
May 18, 2016

Conversation

remh
Copy link

@remh remh commented May 17, 2016

@remh remh added this to the 5.8.0 milestone May 17, 2016
@remh remh force-pushed the remh/kube1.2 branch 2 times, most recently from cb77a5b to 37d942b Compare May 17, 2016 22:54
hkaj
hkaj reviewed May 18, 2016
View reviewed changes
checks.d/kubernetes.py
@@ -46,6 +46,10 @@
RATE: {True: HISTORATE, False: RATE}
}

POD_NAME_LABEL = "io.kubernetes.pod_name"
NAMESPACE_LABEL = "io.kubernetes.pod.namespace"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should create a dict of labels in kubeutil and import it when needed. These 2 are also in checks.d/docker_daemon.py and we'll probably add more in the future. It would be better to have them all in a single place.

@hkaj
Copy link
Member

hkaj commented May 18, 2016

also tests are failing:

test_historate_1_1 (tests.checks.mock.test_kubernetes.TestKubernetes) ... FAIL
test_historate_1_2 (tests.checks.mock.test_kubernetes.TestKubernetes) ... FAIL
test_metrics_1_1 (tests.checks.mock.test_kubernetes.TestKubernetes) ... FAIL
test_metrics_1_2 (tests.checks.mock.test_kubernetes.TestKubernetes) ... FAIL

[k8s/docker] Better support of kubernetes >= 1.2
a72881c 
- Enable kubelet check by default
- Remove master check for now as they are flaky, hard to enable and not used
- Adapt to new format of labels set by kube1.2 fix #2388 #2494
- Allow to blacklist labels
- Support replica sets fix #2444 #2446
- Handle case where no pods are running. Fix #2263
- Add tests for kube 1.2
@hkaj
Copy link
Member

hkaj commented May 18, 2016

LGTM

@remh remh merged commit 055ea2a into master May 18, 2016
@remh remh mentioned this pull request May 18, 2016
Closed
@koudaiii koudaiii mentioned this pull request May 25, 2016
Merged
@remh remh deleted the remh/kube1.2 branch September 30, 2016 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@hkaj hkaj

Labels
None yet
Projects
None yet
Milestone
5.8.0
2 participants
@remh @hkaj