github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,454 Commits 1 Branch 31 Tags
79ef0d79006bfefd03743ed225ba7ef034c0b932
Commit Graph

9404 Commits

Author SHA1 Message Date
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
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
k8s-merge-robot
6815cbf742 Merge pull request #15210 from brendandburns/docs 
Auto commit by PR queue bot
 2015-12-21 07:58:46 -08:00
Wojciech Tyczynski
58336829be Switch to versioned ListOptions in server. 2015-12-21 14:23:37 +01:00
Wojciech Tyczynski
ebc14e1a2e Regenerate clients 2015-12-21 11:12:25 +01:00
k8s-merge-robot
439d7a721e Merge pull request #18878 from janetkuo/delete-job-pod 
Auto commit by PR queue bot
 2015-12-20 16:25:32 -08:00
k8s-merge-robot
b97cfd8d8f Merge pull request #18818 from mqliang/parseordie 
Auto commit by PR queue bot
 2015-12-20 15:08:38 -08:00
k8s-merge-robot
20b7810a21 Merge pull request #16667 from DirectXMan12/refactor/hpa-use-namespacers 
Auto commit by PR queue bot
 2015-12-20 07:34:39 -08:00
k8s-merge-robot
796cc55663 Merge pull request #18773 from ihmccreery/fix-upgrade-proxy 
Auto commit by PR queue bot
 2015-12-19 21:10:34 -08:00
k8s-merge-robot
a29f4babf5 Merge pull request #18544 from timstclair/stats 
Auto commit by PR queue bot
 2015-12-19 19:54:11 -08:00
k8s-merge-robot
cb42bd47bb Merge pull request #18027 from roboll/runonce-datadirs 
Auto commit by PR queue bot
 2015-12-19 19:14:29 -08:00
k8s-merge-robot
7c43797e61 Merge pull request #17516 from kargakis/tighten-generator-validation 
Auto commit by PR queue bot
 2015-12-19 18:36:18 -08:00
k8s-merge-robot
bb65bed98b Merge pull request #16915 from kargakis/move-utility 
Auto commit by PR queue bot
 2015-12-19 17:58:37 -08:00
k8s-merge-robot
44fc4d3f34 Merge pull request #18484 from brendandburns/3rdparty5 
Auto commit by PR queue bot
 2015-12-19 10:12:35 -08:00
k8s-merge-robot
c1b182694b Merge pull request #18461 from mesosphere/sttts-fix-event-error-message 
Auto commit by PR queue bot
 2015-12-19 05:57:24 -08:00
k8s-merge-robot
b12f6b341f Merge pull request #18599 from smarterclayton/abstract_explain 
Auto commit by PR queue bot
 2015-12-19 04:34:32 -08:00
k8s-merge-robot
3c3a24e1d4 Merge pull request #18694 from thockin/airplane_validation_pt7 
Auto commit by PR queue bot
 2015-12-19 03:57:53 -08:00
Dr. Stefan Schimanski
a66b9cd8de Fix ValidateEvent error message 2015-12-19 12:14:54 +01:00
k8s-merge-robot
b7dd32ad70 Merge pull request #18643 from yifan-gu/rkt_get_pod_status 
Auto commit by PR queue bot
 2015-12-19 02:38:31 -08:00
k8s-merge-robot
0b647564fc Merge pull request #18625 from bprashanth/kube_up_flannel 
Auto commit by PR queue bot
 2015-12-19 01:29:11 -08:00
k8s-merge-robot
649855128d Merge pull request #18627 from caesarxuchao/oneline-fix 
Auto commit by PR queue bot
 2015-12-19 00:50:31 -08:00
k8s-merge-robot
4d3f49baf0 Merge pull request #18557 from timstclair/resource-math 
Auto commit by PR queue bot
 2015-12-18 23:33:10 -08:00
Wojciech Tyczynski
1f24297e7a Merge pull request #18921 from timothysc/etcd_datarace 
Fix data race on cancel variable in etcd code
 2015-12-19 08:09:45 +01:00
k8s-merge-robot
00c754108f Merge pull request #18165 from fabianofranz/fixes_get_show_all 
Auto commit by PR queue bot
 2015-12-18 20:01:20 -08:00
k8s-merge-robot
9e8233fc3c Merge pull request #17398 from janetkuo/deployment-controller-informer 
Auto commit by PR queue bot
 2015-12-18 19:13:32 -08:00
Timothy St. Clair
e3311aa93a Fix data race on cancel variable in etcd code 2015-12-18 18:37:45 -06:00
Clayton Coleman
173718059d Slice conversion requires destination package 2015-12-18 19:05:21 -05:00
Timothy St. Clair
c13e4c8c2f re-disable TestWatchEtcdError due to flake 2015-12-18 17:57:46 -06:00
Brendan Burns
e594407ab5 Add dynamic APIs to the list of discoverable APIs 2015-12-18 14:03:43 -08:00
Eric Tune
f15b2e32a7 Merge pull request #16422 from hurf/created_by 
Display controllers along with type when describing a pod
 2015-12-18 13:44:07 -08:00
k8s-merge-robot
464397e27b Merge pull request #17986 from derekwaynecarr/fix_field_selector 
Auto commit by PR queue bot
 2015-12-18 13:18:54 -08:00
k8s-merge-robot
730a6a1d55 Merge pull request #18685 from caesarxuchao/client-gen-output 
Auto commit by PR queue bot
 2015-12-18 10:55:05 -08:00
k8s-merge-robot
77bf81321f Merge pull request #18550 from janetkuo/get-old-new-rc-test 
Auto commit by PR queue bot
 2015-12-18 10:35:21 -08:00
Tim Hockin
0fecf965b4 Change how one-of blocks are validated 
I took a hard look at error output and played until I was happier.  This now
prints JSON for structs in the error, rather than go's format.

Also made the error message easier to read.

Fixed tests.
 2015-12-18 09:42:14 -08:00
Tim Hockin
43ed74748e Clean up and document validation strings 
Also add a detail string for Required and Forbidden.  Fix tests.
 2015-12-18 09:40:50 -08:00
Tim Hockin
27fc14000d audit validation errors to not double-print field names 2015-12-18 09:06:02 -08:00
Wojciech Tyczynski
bf73d1741e Merge pull request #18729 from timstclair/worker-race 
Concurrency fixes for prober tests
 2015-12-18 16:15:13 +01:00
Michail Kargakis
71934b7643 kubectl: Validate flag usage against generators 
This commit moves the generators into separate buckets and creates
separate calls for each one group. This helps in providing just the
necessary generators to each generator command.

Validation of flags against generators is also added so that flags
that are not meant to be used with a specific generator will result
in error.
 2015-12-18 15:09:53 +01:00
Wojciech Tyczynski
96b5ca0cc5 Fix test issue in Go 1.5 2015-12-18 14:17:52 +01:00
Wojciech Tyczynski
d1e039b646 Merge pull request #18635 from timothysc/etcd_client_post_cleanup 
Update to use latest etcd client library
 2015-12-18 14:14:21 +01:00