Commit Graph

26620 Commits

Author SHA1 Message Date
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
k8s-merge-robot
49092c0b99 Merge pull request #22443 from pwittrock/move-serve-hostname
Auto commit by PR queue bot
2016-03-15 21:57:16 -07:00
k8s-merge-robot
a1fcccd8b5 Merge pull request #23016 from timstclair/test-isolation
Auto commit by PR queue bot
2016-03-15 16:56:33 -07:00
k8s-merge-robot
5044c7690b Merge pull request #23015 from eparis/typo
Auto commit by PR queue bot
2016-03-15 16:56:29 -07:00
k8s-merge-robot
2bb7960b61 Merge pull request #22738 from wojtek-t/build_protobufs_in_docker
Auto commit by PR queue bot
2016-03-15 16:56:26 -07: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
k8s-merge-robot
8313504728 Merge pull request #23005 from andyzheng0831/fix
Auto commit by PR queue bot
2016-03-15 16:21:44 -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
Vishnu Kannan
750c089e63 Updating cadvisor deps to v0.22.2
Signed-off-by: Vishnu Kannan <vishnuk@google.com>
2016-03-15 15:50:19 -07:00
Tim St. Clair
a93b67fe97 Add and to the bad symbols check 2016-03-15 15:41:01 -07:00
yeasy
592be0921f Remove duplicated words 2016-03-15 18:39:47 -04: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
879d04046a Merge pull request #21140 from jsafrane/devel/provisioner-e2e
Auto commit by PR queue bot
2016-03-15 13:52:22 -07:00
Andy Zheng
6597daddd6 Trusty: Fix heapster breakage caused by #22940 2016-03-15 13:26:04 -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
Phillip Wittrock
70036b3621 Merge pull request #22993 from piosz/bump-heapster-1.0
Bumped Heapster to stable version 1.0.0
2016-03-15 12:49:54 -07:00
k8s-merge-robot
52b061a4d3 Merge pull request #22969 from nikhiljindal/upgradeTest
Auto commit by PR queue bot
2016-03-15 12:45:52 -07:00
Phillip Wittrock
8a952748a1 Merge pull request #22942 from jsafrane/devel/aws-more-devices
Allow up to 39 PVs attached to AWS node
2016-03-15 12:41:15 -07:00
k8s-merge-robot
d809db9c22 Merge pull request #22946 from pwittrock/flaky-node
Auto commit by PR queue bot
2016-03-15 12:12:10 -07:00
nikhiljindal
435a4e8279 disable kubectl validation for upgrade e2e 2016-03-15 11:26:10 -07:00
Isaac Hollander McCreery
322e6e660e Merge pull request #23000 from ihmccreery/fix-stable
Name stable-1.2 job right to stop clobbering
2016-03-15 11:12:24 -07:00
Isaac Hollander McCreery
85888bb718 Name stable-1.2 job right to stop clobbering 2016-03-15 11:10:32 -07:00
Isaac Hollander McCreery
95417df27f Merge pull request #22997 from ihmccreery/fix-upgrade-versions
Fix upgrade targets to target versions correctly
2016-03-15 11:03:24 -07:00
Isaac Hollander McCreery
343dab01fb Fix upgrade targets to target versions correctly 2016-03-15 10:57:37 -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
k8s-merge-robot
d0437a16e1 Merge pull request #22989 from justinsb/non_masquerade_cidr_plus
Auto commit by PR queue bot
2016-03-15 09:55:34 -07:00
Piotr Szczesniak
1f577181af Bumped Heapster to stable version 1.0.0 2016-03-15 17:44:23 +01: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
k8s-merge-robot
a6d9b091c7 Merge pull request #22794 from wojtek-t/refactor_import_tracker
Auto commit by PR queue bot
2016-03-15 09:20:48 -07:00
k8s-merge-robot
4b7e74ceeb Merge pull request #22898 from nikhiljindal/apiserverexampleport
Auto commit by PR queue bot
2016-03-15 08:46:59 -07:00
Justin Santa Barbara
e0caa1e559 non_masquerade_cidr: verify-flags exception, salt syntax
Cope is non_masquerade_cidr value is empty; add exception for
verify-flags.
2016-03-15 11:05:55 -04:00
Wojciech Tyczynski
919afadbe7 Refactor import tracker 2016-03-15 16:02:18 +01:00
Matt Margolin
e752f2149f Enable non_masquerade_cidr option configured in salt.grains
This should allow allow the non_masquerade_cidr option to get configured
in /etc/salt/minion.d/grains.conf, allowing the flag to used by kubelet
in /etc/sysconfig/kubelet. Default configuration is set in pillar
2016-03-15 09:56:33 -04:00
k8s-merge-robot
73017b6de9 Merge pull request #22381 from hongchaodeng/cache
Auto commit by PR queue bot
2016-03-15 06:33:31 -07:00
Jan Safranek
4402e57588 e2e test for dynamic provisioning.
The test works only on GCE, AWS and OpenStack. It creates and deletes a 2GiB
volume.
2016-03-15 13:01:03 +01:00
k8s-merge-robot
70a303d301 Merge pull request #22935 from wojtek-t/rc_startup_time
Auto commit by PR queue bot
2016-03-15 03:09:15 -07:00
Wojciech Tyczynski
b47018e366 Schedule ReplicationControllers in pod-startup-time test. 2016-03-15 09:56:46 +01:00
k8s-merge-robot
90701f8da1 Merge pull request #22954 from spxtr/scalability
Auto commit by PR queue bot
2016-03-15 00:55:00 -07:00
k8s-merge-robot
536a30fe45 Merge pull request #19313 from quinton-hoole/2015-01-05-ube-design-docs
Auto commit by PR queue bot
2016-03-14 22:25:28 -07:00
k8s-merge-robot
24de13c794 Merge pull request #22971 from andyzheng0831/fix
Auto commit by PR queue bot
2016-03-14 22:25:27 -07:00
Andy Zheng
ab20a9adbe Trusty: Fix node kubelet pod-cidr flag 2016-03-14 21:09:21 -07:00
k8s-merge-robot
34094635ba Merge pull request #22880 from spxtr/aws-job
Auto commit by PR queue bot
2016-03-14 20:41:42 -07:00
k8s-merge-robot
003c77f2d5 Merge pull request #22949 from ixdy/verify-all
Auto commit by PR queue bot
2016-03-14 20:11:41 -07:00
k8s-merge-robot
9c1e6926f6 Merge pull request #22955 from lavalamp/fix-22238
Auto commit by PR queue bot
2016-03-14 19:26:26 -07:00
k8s-merge-robot
a9c17c1fbe Merge pull request #22958 from jlowdermilk/run-test
Auto commit by PR queue bot
2016-03-14 18:10:26 -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
Phillip Wittrock
56af8f3f3b Merge pull request #22959 from ArtfulCoder/dnsconformtest
Conformance Test for DNS
2016-03-14 17:07:08 -07:00