Commit Graph

617 Commits (edf21902b51cfb6b9e1c607452791af31cacd574)

Author SHA1 Message Date
Fabio Yeon 18a3932585 Merge pull request #9265 from mesosphere/upstream-k8sm-cm-and-km
Upstream Kubernetes Mesos controller manager and km binary
2015-06-15 09:28:12 -07:00
James DeFelice f956f23d37 move the container name fix to NewTestPod to avoid breakage in other unit tests in the future 2015-06-15 14:30:48 +00:00
Dr. Stefan Schimanski 615e4f99a7 Fix mesos plugin-test race
ListWatch returned the internal list of the MockPodsListWatch object, leading
to a race. Fixes travis builds.

Fixes mesosphere/kubernetes-mesos#354
2015-06-15 08:18:57 +02:00
James DeFelice 9f53405d42 increase timeout for nested concurrent test that is still intermittently timing out in travis 2015-06-15 02:25:27 +00:00
James DeFelice 5e4992aa5e fix broken TestExecutorLaunchAndKillTask unit test 2015-06-14 03:38:29 +00:00
James DeFelice eca5a2ac88 lower container poll freq to something more sane 2015-06-13 22:23:43 +00:00
James DeFelice c0b686e3be resolve pod readiness issue
see https://github.com/mesosphere/kubernetes-mesos/issues/342
xref #9710
2015-06-13 22:23:43 +00:00
David Oppenheimer 5e5c1d1097 Merge pull request #9767 from mesosphere/skip-exec-test-flake
skip flakey unit test for now
2015-06-13 14:31:21 -07:00
James DeFelice 270a4875b0 fix intermittent deadlock w/ nested concurrent action scheduling and
give each delegate its own errOnce
2015-06-13 15:19:01 +00:00
James DeFelice b8b91fd169 skip flakey unit test for now 2015-06-13 04:25:19 +00:00
Mike Danese 5896ac9e07 skip GetHostIP call on standalone mode kubelet to fix spammy log statement 2015-06-12 11:37:53 -07:00
James DeFelice 1820114a2d Upstream controller manager and km binary
Closes mesosphere/kubernetes-mesos#310
Depends on GoogleCloudPlatform/kubernetes#8882

- fix https://github.com/mesosphere/kubernetes-mesos/issues/336
- Fix comment typo
- Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/9265#commitcomment-11559038
- Add warning to k8s modules to also update mesos copies
- Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/9265#commitcomment-11558864
- Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/9265#commitcomment-11558855
- Add comments and TODO that hypercube and controllermanager need refactoring
2015-06-12 14:03:00 +00:00
James DeFelice 6436c4a3bc additional comments as per code review 2015-06-11 13:47:14 +00:00
James DeFelice 768759d6f1 added km and k8sm-controller-manager binaries from PR#9265 2015-06-11 13:10:01 +00:00
James DeFelice ee309f3cff add TODOs 2015-06-11 12:41:50 +00:00
James DeFelice f445ead2da use common mesos_ prefix for metrics 2015-06-11 12:40:12 +00:00
James DeFelice 932c58a497 Kubernetes Mesos integration
This commit includes the fundamental components of the Kubernetes Mesos
integration:

* Kubernetes-Mesos scheduler
* Kubernetes-Mesos executor
* Supporting libs

Dependencies and upstream changes are included in a separate commit for easy
review.

After this initial upstream, there'll be two PRs following.

* km (hypercube) and k8sm-controller-manager #9265
* Static pods support #9077

Fixes applied:

- Precise metrics subsystems definitions
  -  mesosphere/kubernetes-mesos#331
  - https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion_r31875232
  - https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion_r31875240
- Improve comments and add clarifications
  - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875208
  - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875226
  - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875227
  - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875228
  - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875239
  - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875243
  - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875234
  - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875256
  - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875255
  - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875251
- Clarify which Schedule function is actually called
  - Fixes https://github.com/GoogleCloudPlatform/kubernetes/pull/8882#discussion-diff-31875246
2015-06-10 20:58:39 +00:00