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
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
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
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
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
k8s-merge-robot
45064e19d1
Merge pull request #22793 from justinsb/fix_22792
...
Auto commit by PR queue bot
2016-03-11 20:37:25 -08:00
k8s-merge-robot
26e309c753
Merge pull request #22784 from justinsb/fix_17626
...
Auto commit by PR queue bot
2016-03-11 20:04:13 -08:00
k8s-merge-robot
5f5ac27996
Merge pull request #22502 from caesarxuchao/ignore-notfound-etcd
...
Auto commit by PR queue bot
2016-03-11 15:53:51 -08:00
k8s-merge-robot
de7193a095
Merge pull request #22788 from justinsb/fix_22786
...
Auto commit by PR queue bot
2016-03-11 15:13:06 -08:00
k8s-merge-robot
949b2e612a
Merge pull request #22791 from justinsb/fix_15073
...
Auto commit by PR queue bot
2016-03-11 13:43:32 -08:00
Brian Grant
b7984b2fa7
Merge pull request #22862 from jlowdermilk/typo
...
fix typo in kubectl run help string
2016-03-11 12:26:48 -08:00
Brian Grant
d514a65c8d
Merge pull request #22802 from ncdc/httpstream-reset-streams-when-closing-connection
...
Close streams with Reset instead of Close when closing streaming connections
2016-03-11 12:21:19 -08:00
Brian Grant
3defbc6680
Merge pull request #22410 from nikhiljindal/apiReferenceFlag
...
Deprecating --api-version flag
2016-03-11 12:14:43 -08:00
Brian Grant
532ba5a3c6
Merge pull request #21535 from AdoHe/restore_secure_etcd
...
restore ability to run against secured etcd
2016-03-11 12:14:06 -08:00
nikhiljindal
593b78f925
Deprecating --api-version flag
2016-03-11 10:12:44 -08:00
Jeff Lowdermilk
627615c870
fix typo in kubectl run help string
2016-03-11 10:11:14 -08:00
Brian Grant
5cc7790f45
Merge pull request #22853 from deads2k/parse-version
...
allow resource.version.group in kubectl
2016-03-11 10:11:00 -08:00
Brian Grant
c6b4518aed
Merge pull request #22666 from pmorie/pod-ip-flake-redux
...
Fix flake in pod IP as env var e2e
2016-03-11 09:42:40 -08:00
Andy Goldstein
7230bd1096
Fix rkt GetPods() order
...
Use an array to store the pod IDs and use that to build the pod array with consistent ordering,
instead of map ordering, which is random and causes test flakes.
2016-03-11 12:32:22 -05:00
Brian Grant
1c50f1831c
Merge pull request #22849 from soltysh/issue22836
...
Added api discovery to kubectl run, based on which we decide which generators to use
2016-03-11 09:04:12 -08:00
Justin Santa Barbara
e40595fa57
AWS volumes: Release disk from attaching map on error
...
If AWS gives us an actual error (vs just timing out), we know the disk
did not attach, and so we can remove it immediately from the attaching
map.
2016-03-11 11:40:39 -05:00
Andy Goldstein
01b33ec330
Close streams with Reset instead of Close when closing streaming connections
...
This ensures that the call to close the underlying streaming connection will execute immediately,
instead of waiting for all streams to gracefully shut down.
2016-03-11 11:28:08 -05:00
AdoHe
7228b9b987
restore ability to run against secured etcd
2016-03-11 11:21:16 -05:00