github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,712 Commits 1 Branch 31 Tags
a7f14665560e8aafbe7d409bc41ca22a2575a900
Commit Graph

11188 Commits

Author SHA1 Message Date
k8s-merge-robot
a7f1466556 Merge pull request #19577 from caesarxuchao/expose-swagger-for-discovery-types 
Auto commit by PR queue bot
 2016-03-17 12:50:17 -07:00
k8s-merge-robot
cda4583984 Merge pull request #23035 from xinxiaogang/xnxin-master 
Auto commit by PR queue bot
 2016-03-17 12:05:56 -07:00
k8s-merge-robot
435bc35812 Merge pull request #23091 from nikhiljindal/namespaceSwaggerSpec 
Auto commit by PR queue bot
 2016-03-17 08:35:06 -07:00
k8s-merge-robot
4e67d9606c Merge pull request #23083 from janetkuo/rollout-undo-paused-check 
Auto commit by PR queue bot
 2016-03-17 06:28:39 -07:00
k8s-merge-robot
53c6b35b71 Merge pull request #23038 from wojtek-t/rename_raw_json_to_raw 
Auto commit by PR queue bot
 2016-03-17 04:05:43 -07:00
k8s-merge-robot
2880708444 Merge pull request #23030 from timothysc/api_etcd_error 
Auto commit by PR queue bot
 2016-03-17 03:30:59 -07:00
Wojciech Tyczynski
e610c137c0 Regenerate auto-generated files 2016-03-17 09:30:02 +01:00
Xiaogang Xin
f5c631e220 kubernetes/kubernetes#23034 Fix controller-manager race condition issue which cause endpoints flush during restart 2016-03-17 11:08:48 +08:00
nikhiljindal
96044b7f43 Fixing the check to determine if the resource is namespaced 2016-03-16 17:46:05 -07:00
Janet Kuo
2bd30c7572 Stop the users from rolling back a paused deployment in kubectl rollout undo 2016-03-16 15:46:22 -07:00
k8s-merge-robot
c412dcba7f Merge pull request #23023 from caesarxuchao/minor-fix-aliases 
Auto commit by PR queue bot
 2016-03-16 10:35:36 -07:00
k8s-merge-robot
41c85d1113 Merge pull request #22999 from smarterclayton/better_auth_error 
Auto commit by PR queue bot
 2016-03-16 09:59:20 -07:00
Wojciech Tyczynski
218d3e5923 Rename RawJSON to Raw in runtime.Unknown and add ContentType & ContentEncoding. 2016-03-16 16:43:58 +01:00
tobad357
3d530f7f37 Fix for issue #22932 infinite pod restarts 
This fixes an issue when using CNI where the hash of a Container object will differ between creation and change checks due to the docker image exporting ports
 2016-03-16 22:43:39 +08:00
k8s-merge-robot
71a3b91ac1 Merge pull request #22966 from timstclair/server 
Auto commit by PR queue bot
 2016-03-16 04:54:27 -07:00
k8s-merge-robot
22e3e79c53 Merge pull request #22930 from AdoHe/change_global_timeout 
Auto commit by PR queue bot
 2016-03-16 01:44:02 -07:00
k8s-merge-robot
17d8e61244 Merge pull request #22921 from liggitt/job-validation 
Auto commit by PR queue bot
 2016-03-16 01:11:20 -07:00
k8s-merge-robot
460ece34d5 Merge pull request #22928 from caesarxuchao/print-client-gen-command 
Auto commit by PR queue bot
 2016-03-16 00:38:39 -07:00
k8s-merge-robot
a4097fa4f1 Merge pull request #22891 from yifan-gu/rkt_version 
Auto commit by PR queue bot
 2016-03-16 00:04:55 -07:00
Jordan Liggitt
64f51723c8 Avoid populating job selector from pod template labels in autoSelector case 2016-03-16 02:23:01 -04:00
Timothy St. Clair
d3da93c174 Renaming api/errors/etcd to api/errors/storage as it no longer 
has any etcd specific dependencies.  Reference issue #17546
 2016-03-15 20:23:47 -05:00
Phillip Wittrock
57bd9d4289 Merge pull request #23020 from vishh/godeps-cadvisor 
Updating cadvisor deps to v0.22.2
 2016-03-15 16:53:49 -07:00
Yifan Gu
fe2c3c351a rkt: Split checkVersion() to two parts: get version, and check version. 
This enables rkt runtime to setup versions during creation,
this fixes a kubelet nil pointer panic when kubelet tries to get the
rkt versions but it's not set.
 2016-03-15 16:35:26 -07:00
Chao Xu
ed78b9adbe let the apiserver's swaggerapi endpoint reports discovery types 2016-03-15 16:32:20 -07:00
Phillip Wittrock
6170326db1 Merge pull request #23012 from caesarxuchao/fix-22996 
Make fullyLabeledReplicas optional in rc status
 2016-03-15 16:09:57 -07:00
Chao Xu
51886c3880 move aliasToResource to a field of DefaultRESTMapper 2016-03-15 16:07:25 -07:00
Vishnu kannan
d269775929 Update cadvisor linux module to work with the cadvisor v0.22.2 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-03-15 16:02:05 -07:00
Chao Xu
9bdd30fdf1 make fullyLabeledReplicas optional in rc and rs status 2016-03-15 15:10:55 -07:00
k8s-merge-robot
204d426dd3 Merge pull request #22310 from krousey/adapterbreak 
Auto commit by PR queue bot
 2016-03-15 14:28:38 -07:00
k8s-merge-robot
4b3e2b57ac Merge pull request #22948 from janetkuo/e2e-test-not-mutate 
Auto commit by PR queue bot
 2016-03-15 13:18:06 -07:00
Janet Kuo
26bcdb1bd6 Separate GetOldRS and GetNewRS in deployment controller (get and mutate) and deployment util (get only) 2016-03-15 10:23:20 -07:00
Clayton Coleman
dccf114fdd Display a better error on unauthorized 
Not being logged in is a common user error, and the message we display
can be more specific to an end user. Provide a friendly message with the
server message in parethesis (in case this is a more complex server
error).
 2016-03-15 12:51:23 -04:00
Jan Safranek
f270cb1b9b Allow 39 atached EBS devices. 
AWS has soft support limit for 40 attached EBS devices. Assuming there is just
one root device, use the rest for persistent volumes.

The devices will have name /dev/xvdba - /dev/xvdcm, leaving /dev/sda - /dev/sdz
to the system.

Also, add better error handling and propagate error
"Too many EBS volumes attached to node XYZ" to a pod.
 2016-03-15 17:28:59 +01:00
AdoHe
28e1d1af65 reduce component status probe timeout to 20s for quickly timeout 2016-03-14 22:18:55 -04:00
Tim St. Clair
8cb820be0e Set correct applicatoin/json mime type for some kubelet endpoints 2016-03-14 18:04:17 -07:00
k8s-merge-robot
bf1bb5d309 Merge pull request #22899 from justinsb/aws_fix_e2e 
Auto commit by PR queue bot
 2016-03-14 17:37:13 -07:00
k8s-merge-robot
7d0de5c7d6 Merge pull request #19905 from ixdy/export-go-version 
Auto commit by PR queue bot
 2016-03-14 15:51:30 -07:00
k8s-merge-robot
2458871b52 Merge pull request #22746 from deads2k/fix-discover-config 
Auto commit by PR queue bot
 2016-03-14 15:15:16 -07:00
Kris
4d404ded1a Moving adapters to their own packages 2016-03-14 14:22:34 -07:00
Jeff Grafton
fb663f2cd5 Include Go version, platform, and other build info in version string 
Additionally update MatchesServerVersion to only check GitVersion,
GitCommit, and GitTreeState.
 2016-03-14 13:55:28 -07:00
Chao Xu
ec02dfc9f0 generated changes 2016-03-14 10:28:20 -07:00
k8s-merge-robot
b26d6cb706 Merge pull request #22785 from wojtek-t/fix_resthandler_test 
Auto commit by PR queue bot
 2016-03-14 08:32:58 -07:00
k8s-merge-robot
c195b574fe Merge pull request #22910 from liggitt/delete-collection 
Auto commit by PR queue bot
 2016-03-14 03:12:44 -07:00
Jordan Liggitt
5e68cec23c Test relative timestamps using UTC 2016-03-13 20:46:59 -04:00
Jordan Liggitt
a1c2267f20 Decrease parallelism in deletecollection test, lengthen test etcd certs 2016-03-12 18:30:12 -05:00
Jordan Liggitt
d008283942 Tolerate multiple registered versions in a single group 2016-03-12 12:49:41 -05:00
Justin Santa Barbara
3e12e8b7cc AWS e2e: don't try to build a full cloudprovider in e2e 
We have previously tried building a full cloudprovider in e2e for AWS;
this wasn't the best idea, because e2e runs on a different machine than
normal operations, and often doesn't even run in AWS.  In turn, this
meant that the cloudprovider had to do extra work and have extra code,
which we would like to get rid of.  Indeed, I got rid of some code which
tolerated not running in AWS, and this broke e2e.
 2016-03-12 06:14:45 -05:00
k8s-merge-robot
3b208815fd Merge pull request #22713 from yifan-gu/rkt_fix_entrypoint 
Auto commit by PR queue bot
 2016-03-12 01:41:53 -08:00
k8s-merge-robot
1ad0c97837 Merge pull request #22847 from caesarxuchao/matching-replicas 
Auto commit by PR queue bot
 2016-03-12 01:10:43 -08:00
Chao Xu
a6240c1ab8 add FullyLabeledReplicas in Replicaset Status and ReplicationController Status 2016-03-11 23:55:04 -08:00