github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
12,888 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

367 Commits (07b5930a7038fda621d201190a0e5257b0b0677c)

Author SHA1 Message Date
Fabio Yeon da02e3059a Merge pull request #9789 from mesosphere/plugin-test-race 
Fix mesos plugin-test race
 2015-06-15 13:04:12 -07:00
Fabio Yeon 65ea6b914c Merge pull request #9785 from mesosphere/longer-timeout-for-proc-test 
increase timeout for nested concurrent test...
 2015-06-15 10:11:51 -07:00
Fabio Yeon 3dcf97a07c Merge pull request #9741 from mesosphere/fix-k8sm-342 
Fix kubernetes-mesos issue 342: pod readiness bug
 2015-06-15 10:11:06 -07:00
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
Daniel Smith 1a1307765c add 'porter' test container 2015-06-12 17:17:43 -07:00
Abhi Shah 3ce7fe8310 Merge pull request #9722 from mikedanese/host-ip-spam 
Fix spammy GetHostIP error log in kubelet
 2015-06-12 15:26:54 -07:00
Abhi Shah 86b6150fb0 Merge pull request #9287 from brendandburns/kubectl 
Add some XSRF protection to kubectl proxy.
 2015-06-12 13:51:08 -07: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
Abhi Shah 52db576617 Merge pull request #8882 from mesosphere/upstream_k8sm 
Upstream Kubernetes-Mesos framework
 2015-06-12 06:36:20 -07: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
Brendan Burns 4aeee94603 Add some XSRF protection to kubectl proxy. 2015-06-10 20:55:33 -07: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
derekwaynecarr 5b005fa30b Add namespace describer 2015-06-09 15:52:44 -04:00
Mike Danese d326de9b6c Merge pull request #9319 from skonzem/fix_doc_typos 
Fix misspellings in documentation
 2015-06-05 12:00:37 -07:00
Quinton Hoole b425ed1ff5 Merge pull request #9293 from saad-ali/upgradeNFSJun42015 
Rev NFS image because of #9019
 2015-06-05 09:24:57 -07:00
Scott Konzem 1cff55f874 Fix misspellings in documentation 2015-06-05 11:35:17 -04:00
Quinton Hoole fc80fd6860 Merge pull request #9233 from lavalamp/no-ro-nonbreaking 
Allow kubectl proxy to proxy everything
 2015-06-04 16:22:07 -07:00
Quinton Hoole 1a679bcf5c Merge pull request #9239 from brendandburns/ha 
Pro-actively give up the lease if the TTL expires
 2015-06-04 16:18:59 -07:00
Alex Robinson b42869181a Merge pull request #9277 from GoogleCloudPlatform/sidecar 
Fix Sidecar PR
 2015-06-04 14:33:55 -07:00
saadali 465d7848da Rev NFS image because of #9019 2015-06-04 13:22:56 -07:00
Brendan Burns 6b837ae004 Add pro-active TTL based lease releasing when we can't communicate with etcd. 2015-06-03 22:03:56 -07:00
Brian Grant e7788771d6 Merge pull request #9030 from brendandburns/kubectl 
Add a custom timeout flag for stop/delete.
 2015-06-03 21:14:50 -07:00
Daniel Smith 6695d16cb7 fix prometheus usage of kubectl proxy 2015-06-03 18:31:45 -07:00
Brian Grant f8bf996000 Merge pull request #9211 from lavalamp/no-ro-nonbreaking 
Nonbreaking pieces of #8155
 2015-06-03 16:44:24 -07:00
Daniel Smith d19490d572 update prometheus example 2015-06-03 15:41:09 -07:00
Brian Grant a8a3e9d0c7 Merge pull request #9133 from brendandburns/ha 
Added a simple utility for master election and pod creation.
 2015-06-03 14:46:03 -07:00
Brendan Burns 8c4f8a67f0 Added a simple utility for master election and pod creation. 2015-06-03 13:29:51 -07:00
Brendan Burns ab0c9b8e1e Add a custom timeout flag for stop/delete. Also try to be smarter about setting the timeout. 2015-06-03 11:21:30 -07:00
Daniel Smith e3c0e38f1b Move cluster client creation to client.NewInCluster() 
Built & pushed nettest:1.4.
 2015-06-02 18:47:06 -07:00
Filip Grzadkowski 98115facfd Revert "Gracefully delete pods from the Kubelet" 2015-06-02 23:40:05 +02:00
Brian Grant 949ce892f7 Merge pull request #9094 from derekwaynecarr/update_environ 
Align systemd environ file with optimal admission controllers
 2015-06-02 10:40:33 -07:00
derekwaynecarr c2642a1349 Align systemd environ file with optimal admission controllers 2015-06-01 21:30:08 -04:00
Clayton Coleman cfb122a3bf Enable network-tester to test graceful deletion 2015-06-01 19:24:00 -04:00
Chao Xu 28c1d7ac5b remove ports.name 2015-06-01 11:37:03 -07:00
Chao Xu 1f8404cb6a let the contrib/git-sync use a for-loop, rather than relying on the pod's restart policy, to periodically pull from the repo 2015-06-01 11:13:51 -07:00
Chao Xu 94c6c121cc update contrib/git-sync/demo to v1beta3 2015-06-01 11:13:51 -07:00
Eric Tune 3db1f69eea Merge pull request #8764 from eparis/sd_notify 
API server explicitly notify systemd of successful startup
 2015-06-01 10:28:49 -07:00