Commit Graph

9447 Commits

Author SHA1 Message Date
Wojciech Tyczynski
05b60a30cf Fix flakes in cacher_test 2015-12-28 15:28:07 +01:00
k8s-merge-robot
25f5daa0e2 Merge pull request #19135 from wojtek-t/close_watch_in_generic_registry
Auto commit by PR queue bot
2015-12-28 05:36:11 -08:00
k8s-merge-robot
1e19011f9a Merge pull request #19133 from wojtek-t/cleanup_logs
Auto commit by PR queue bot
2015-12-28 05:36:08 -08:00
k8s-merge-robot
451f4bdbc2 Merge pull request #19130 from wojtek-t/fix_stop_cacher
Auto commit by PR queue bot
2015-12-28 03:45:34 -08:00
Wojciech Tyczynski
1803a11557 Get rid of rubbish logs from serialization_test 2015-12-28 12:13:07 +01:00
k8s-merge-robot
c36226bc39 Merge pull request #19058 from gmarek/more-metrics
Auto commit by PR queue bot
2015-12-28 03:09:23 -08:00
Wojciech Tyczynski
8dc83547b0 Close watch in generic etcd_test 2015-12-28 11:43:20 +01:00
Wojciech Tyczynski
ec70eb16f3 Graceul termination in Cacher 2015-12-28 10:54:21 +01:00
Wojciech Tyczynski
0b7dce9505 Fix a bug in etcd_watcher_test 2015-12-28 10:43:33 +01:00
gmarek
2c6c8d8371 Finish MetricsGrabber 2015-12-28 09:19:40 +01:00
k8s-merge-robot
500493a3ac Merge pull request #18925 from caesarxuchao/refactor-registration
Auto commit by PR queue bot
2015-12-24 15:19:36 -08:00
k8s-merge-robot
21c01c05e3 Merge pull request #18902 from deads2k/gv-partial
Auto commit by PR queue bot
2015-12-24 01:42:59 -08:00
k8s-merge-robot
16e1de6db6 Merge pull request #18859 from deads2k/gv-grab-bag
Auto commit by PR queue bot
2015-12-23 23:57:24 -08:00
Chao Xu
ad484c79f7 pass runtime.Scheme as parameter to AddToScheme 2015-12-23 23:21:35 -08:00
Chao Xu
2b5b708b70 Refactor the API registration and installation 2015-12-23 22:44:25 -08:00
k8s-merge-robot
be235e8754 Merge pull request #18940 from smarterclayton/nil_body
Auto commit by PR queue bot
2015-12-23 18:02:03 -08:00
k8s-merge-robot
344d4bb5fa Merge pull request #18798 from yifan-gu/rkt_bump
Auto commit by PR queue bot
2015-12-23 13:37:36 -08:00
k8s-merge-robot
05a1295085 Merge pull request #18714 from gmarek/metrics-grabber
Auto commit by PR queue bot
2015-12-23 10:30:06 -08:00
k8s-merge-robot
ac0ce7257b Merge pull request #18702 from wojtek-t/remove_unversioned_selectors
Auto commit by PR queue bot
2015-12-23 09:51:53 -08:00
k8s-merge-robot
c3fcfd9651 Merge pull request #17881 from jiangyaoguo/emit-event-when-delete-pod
Auto commit by PR queue bot
2015-12-23 07:01:54 -08:00
Marek Grabowski
e5d4663dd8 Merge pull request #19013 from wojtek-t/eliminate_rubish_logs
Eliminate rubbish logs in pkg/conversion tests
2015-12-23 08:43:31 +01:00
Marek Grabowski
cf69083697 Merge pull request #19031 from mikedanese/fix-flake
fix flake in deployment unit test
2015-12-23 08:38:13 +01:00
Mike Danese
b2aa98f50d fix flake in deployment unit test 2015-12-22 14:28:44 -08:00
Mike Danese
da8b85e5c7 Merge pull request #18858 from jayunit100/overlogging-rclient
Minimize log level for request backoffs
2015-12-22 14:08:06 -08:00
Mike Danese
bee582293c Merge pull request #19010 from wojtek-t/debug_watcher_test
Fix etcdWatcher test
2015-12-22 14:07:41 -08:00
Yifan Gu
644aa9536a rkt: Remove pod_info.go, clean up codes that not needed anymore. 2015-12-22 12:02:25 -08:00
Yifan Gu
ee7251ed10 rkt: Update for newest api version. 2015-12-22 12:02:25 -08:00
Yifan Gu
278f0dc8ad rkt: Replace image cat-manifest/list with api calls. 2015-12-22 12:02:25 -08:00
Clayton Coleman
11af69da78 Ensure DeleteOptions is registered to other groups
The version of DeleteOptions supported by v1beta1 extensions and
v1alpha1 metrics is the v1 core group version.
2015-12-22 14:29:15 -05:00
Clayton Coleman
6d4612c8d2 Remove redundant / complex client code 2015-12-22 14:29:15 -05:00
Brendan Burns
ac5c0aaba7 Merge pull request #17883 from jimmidyson/cadvisor-bump-0.19.4
Bump cadvisor to fix interface stats bugs & improve performance
2015-12-22 10:34:46 -08:00
Brendan Burns
b6ca92127d Merge pull request #16980 from jackgr/force_apply
Implement conflict detection in strategic merge patch
2015-12-22 10:33:35 -08:00
Wojciech Tyczynski
9f35eebb81 Fix timeout in etcdwatcher tests 2015-12-22 16:56:54 +01:00
jay vyas
4891d827ac Delete extra logs, especially to prevent kubelet which makes many clients, from overlogging. 2015-12-22 10:38:24 -05:00
Wojciech Tyczynski
55747ec1ce Eliminate rubbish logs in pkg/conversion test 2015-12-22 16:07:30 +01:00
Wojciech Tyczynski
8cd50dd005 Fix etcdWatcher test 2015-12-22 15:40:52 +01:00
Filip Grzadkowski
d20ab89bd6 Merge pull request #19006 from wojtek-t/wait_on_stop_watch
Fix race in watch tests - attempt 3
2015-12-22 14:28:40 +01:00
Wojciech Tyczynski
41c7835039 Fix race in watch tests 2015-12-22 13:21:02 +01:00
k8s-merge-robot
390e91793f Merge pull request #18918 from smarterclayton/conversion_import
Auto commit by PR queue bot
2015-12-22 04:20:30 -08:00
gmarek
9dbbc4e1df Add a tool for grabbing and parsing prometheus metrics 2015-12-22 12:33:37 +01:00
Wojciech Tyczynski
4aa2121a8e Remove dead code 2015-12-22 11:07:22 +01:00
Wojciech Tyczynski
e108a32b08 Merge pull request #18655 from wojtek-t/versioned_list_options_in_server
Switch to versioned ListOptions in server.
2015-12-22 10:57:09 +01:00
Filip Grzadkowski
6ac2774dea Merge pull request #18999 from wojtek-t/close_watchers
Close watchers in tests
2015-12-22 10:56:25 +01:00
Wojciech Tyczynski
2b8854ba28 Close watchers in tests 2015-12-22 09:54:05 +01:00
k8s-merge-robot
058896340d Merge pull request #18985 from mlafeldt/patch-1
Auto commit by PR queue bot
2015-12-22 00:48:54 -08:00
k8s-merge-robot
9168a5c8b1 Merge pull request #17865 from HaiyangDING/multi-scheduler-phase-1
Auto commit by PR queue bot
2015-12-22 00:19:01 -08:00
Wojciech Tyczynski
0cdd2abada Merge pull request #18956 from wojtek-t/debug_etcd_generic
Fix race in EtcdWatcher
2015-12-22 08:02:49 +01:00
HaiyangDING
d9f3607292 Implement multi-scheduler:
1. Name default scheduler with name `kube-scheduler`
2. The default scheduler only schedules the pods meeting the following condition:
	- the pod has no annotation "scheduler.alpha.kubernetes.io/name: <scheduler-name>"
	- the pod has annotation "scheduler.alpha.kubernetes.io/name: kube-scheduler"

update gofmt

update according to @david's review

run hack/test-integration.sh, hack/test-go.sh and local e2e.test
2015-12-22 10:49:40 +08:00
Mathias Lafeldt
1701cd4a3a Fix closing bracket in Godoc 2015-12-21 21:36:11 +01:00
Wojciech Tyczynski
6297232112 Fix race in EtcdWatcher 2015-12-21 19:24:37 +01:00