github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
25,236 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

25236 Commits (599af17e0dd35749135415b911c9d24c9f43c18d)

Author SHA1 Message Date
k8s-merge-robot 599af17e0d Merge pull request #21685 from gmarek/resource-usage 
Auto commit by PR queue bot
 2016-02-23 00:16:21 -08:00
k8s-merge-robot 2acae62709 Merge pull request #21683 from justinsb/fix_20912 
Auto commit by PR queue bot
 2016-02-22 23:45:45 -08:00
k8s-merge-robot 5d4007f2fa Merge pull request #21644 from thibserot/dns2 
Auto commit by PR queue bot
 2016-02-22 23:45:44 -08:00
k8s-merge-robot 0afbc71f31 Merge pull request #21030 from janetkuo/deployment-label-adopted 
Auto commit by PR queue bot
 2016-02-22 23:45:42 -08:00
Brian Grant 7662a5ee54 Merge pull request #21734 from janetkuo/rollover-flake 
Wait for pods to become available before rolling over in deployment e2e test
 2016-02-22 20:15:33 -08:00
Janet Kuo ecce9492cc Wait for pods to become available before rolling over in deployment e2e test 2016-02-22 18:36:39 -08:00
Brian Grant f4de3ea676 Merge pull request #21710 from janetkuo/flake-event-order 
Don't rely on events in deployment rollback e2e test
 2016-02-22 17:54:07 -08:00
Prashanth B c833a14898 Merge pull request #21727 from dchen1107/test 
Remove potential corrupted docker network checkpoint file before star…
 2016-02-22 17:52:16 -08:00
Dawn Chen d922ddef8c Remove potential corrupted docker network checkpoint file before start docker 
again.
 2016-02-22 17:08:31 -08:00
Brian Grant 6cecf2b357 Merge pull request #21715 from janetkuo/remove-racy-check 
Remove racy check in waitForDeploymentStatus; wait for underlying resources to reach the desired state instead
 2016-02-22 16:22:14 -08:00
k8s-merge-robot be68276db0 Merge pull request #21708 from spxtr/fix-trusty 
Auto commit by PR queue bot
 2016-02-22 16:16:54 -08:00
k8s-merge-robot 789fd731d2 Merge pull request #21686 from justinsb/aws_kubeup_build_config_early 
Auto commit by PR queue bot
 2016-02-22 16:16:53 -08:00
k8s-merge-robot 8afccef608 Merge pull request #21632 from justinsb/docker_191 
Auto commit by PR queue bot
 2016-02-22 16:16:51 -08:00
Dawn Chen 84e5ea9940 Merge pull request #21518 from jlowdermilk/node-labels 
Plumb node labels through salt
 2016-02-22 16:11:01 -08:00
Jeff Lowdermilk c406665b2b Plumb node labels through salt 
Expose node-labels flag on kubelet for gce via a startup script
env var.
 2016-02-22 15:31:34 -08:00
Dawn Chen 699c80b752 Merge pull request #21641 from bprashanth/promisc 
Teach the kubelet about promiscuous mode, take 2
 2016-02-22 15:08:18 -08:00
Dawn Chen 201d60b426 Merge pull request #21440 from bprashanth/glbc_name 
Add image version to glbc name.
 2016-02-22 14:48:48 -08:00
Janet Kuo d2c9d51999 Remove racy check in waitForDeploymentStatus; wait for underlying resources to reach the desired state instead 2016-02-22 14:47:38 -08:00
Dawn Chen 1e680c9d94 Merge pull request #21158 from kubernetes/milestone-doc 
Add milestone tag clarifications
 2016-02-22 14:11:45 -08:00
k8s-merge-robot fb2a209ed7 Merge pull request #21221 from yifan-gu/rkt_doc 
Auto commit by PR queue bot
 2016-02-22 14:02:54 -08:00
Janet Kuo eaa4eb10aa Don't rely on events in deployment rollback e2e test 2016-02-22 13:51:51 -08:00
Dawn Chen b58826292a Merge pull request #21703 from dchen1107/test 
Make sure docker is properly shutdown before startup.
 2016-02-22 13:35:24 -08:00
Joe Finney 1dea4052b9 Properly set runner for trusty gce jobs. 2016-02-22 13:30:49 -08:00
Dawn Chen 6c5f07d58e Make sure docker is properly shutdown before startup. 2016-02-22 12:57:42 -08:00
Yifan Gu b3ed1b633f docs/rkt: Document the different UX. 2016-02-22 11:46:02 -08:00
k8s-merge-robot 6a199706cb Merge pull request #21423 from ihmccreery/version-guard-deployments 
Auto commit by PR queue bot
 2016-02-22 11:04:51 -08:00
k8s-merge-robot 347a509744 Merge pull request #21226 from justinsb/aws_jessie_image 
Auto commit by PR queue bot
 2016-02-22 11:04:49 -08:00
k8s-merge-robot 818aaaa5c1 Merge pull request #21201 from erictune/mac-unit-test 
Auto commit by PR queue bot
 2016-02-22 11:04:47 -08:00
Janet Kuo 4699a6d8a2 Address comments; fix test failure 2016-02-22 10:58:54 -08:00
Janet Kuo dc78af948e Address comments; fix incorrect hash 2016-02-22 10:58:54 -08:00
Janet Kuo 0e5da8460d Address comments 2016-02-22 10:58:54 -08:00
Janet Kuo 14bab2bb3a Address comments 2016-02-22 10:58:54 -08:00
Janet Kuo 11fdbff97f Address comments; fix test failures; add e2e tests; update RS's label too 2016-02-22 10:58:54 -08:00
Janet Kuo da58172283 Ensure Deployment labels adopted ReplicaSets and pods 2016-02-22 10:58:54 -08:00
Brian Grant 3042f1d1c8 Merge pull request #21300 from soltysh/ds_docs 
Updated label selector for daemon set
 2016-02-22 10:17:56 -08:00
k8s-merge-robot 11cdc919f5 Merge pull request #21364 from pwittrock/macdu 
Auto commit by PR queue bot
 2016-02-22 10:09:03 -08:00
Brian Grant d677e096df Merge pull request #21689 from bgrant0607/bugfix1 
Mark flaky Deployment e2e tests until the problems are resolved.
 2016-02-22 10:06:05 -08:00
Justin Santa Barbara f117b26c07 AWS: Template for jessie image 
Based on the official debian image, with the following changes:

* Switched extlinux -> grub, because we need to change kernel options
to enable the memory cgroup controller, and extlinux is harder and has
reboot problems
* Added packages that would otherwise be installed as part of the boot
(just an optimization)
* Also add the cloud-initramfs-growroot package; with it the root
volume will resize.
* We add panic=10 & oops=panic to kernel options
* We install the packages as per the base image, except we install
  awscli from pip, because the repo version is really old.
 2016-02-22 12:47:34 -05:00
k8s-merge-robot 9b9b4fee11 Merge pull request #21278 from pweil-/include-discovery 
Auto commit by PR queue bot
 2016-02-22 09:31:53 -08:00
Brian Grant bd3cde0e0a Mark flaky Deployment e2e tests until the problems are resolved. 
Ref #21463, #21467, #21491, #19299
 2016-02-22 17:27:14 +00:00
k8s-merge-robot 95354490c1 Merge pull request #21318 from kargakis/record-command-factory-method-tweak 
Auto commit by PR queue bot
 2016-02-22 08:11:57 -08:00
Justin Santa Barbara 050863cf93 AWS kube-up: Build kubeconfig asap 
Once we've built the master, we can build kubeconfig.  By doing so, if
we time out waiting for the nodes, the system is still configured
correctly.

In particular, spot instances can be slow to launch.

Related to issue #21200
 2016-02-22 10:46:56 -05:00
gmarek 20e15cb6af Changes in resource gathering to help debugging 2016-02-22 16:45:30 +01:00
k8s-merge-robot 2c3b3d5716 Merge pull request #21494 from saad-ali/markRemainingTwoPDTestsAsSlow 
Auto commit by PR queue bot
 2016-02-22 07:41:46 -08:00
k8s-merge-robot 90d1276507 Merge pull request #21223 from hongchaodeng/fix 
Auto commit by PR queue bot
 2016-02-22 07:41:45 -08:00
Justin Santa Barbara 7e69426b8b AWS: Only warn about nameless instances if they are running 
Otherwise this is just confusing logspam.

Fix #20912
 2016-02-22 10:27:13 -05:00
Eric Tune cef288eb42 Warn when not enough FDs 
Helps debug problem when running tests on OS X.
 2016-02-22 07:27:10 -08:00
k8s-merge-robot c533ae4dd0 Merge pull request #21667 from HaiyangDING/patch-3 
Auto commit by PR queue bot
 2016-02-22 06:52:02 -08:00
Wojciech Tyczynski d089fa8030 Merge pull request #21676 from kubernetes/revert-21438-terminated_pods 
Revert "kubelet: fix duplicated status updates at pod cleanup"
 2016-02-22 14:41:02 +01:00
Wojciech Tyczynski 93a0eac476 Revert "kubelet: fix duplicated status updates at pod cleanup" 2016-02-22 14:27:49 +01:00