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

36 Commits (28a601571c39bacbb17bf92d56251eb759e91cc2)

Author SHA1 Message Date
k8s-merge-robot a0b04a6df8 Merge pull request #20281 from cilium-team/fixing-docker-d 
Auto commit by PR queue bot
 2016-02-28 03:51:31 -08:00
André Martins 97acdf4cd8 fixing docker -d deprecation 
Signed-off-by: André Martins <aanm90@gmail.com>
 2016-02-14 23:07:32 +01:00
Lucas Käldström d5b7fd7f95 Remove -v /dev:/dev from docker and docker-multinode 2016-02-07 22:15:20 +02:00
Lucas Käldström f18d40c28e Update docker-multinode, use restart=on-failure and bump to 1.2.0-alpha.7 2016-02-02 15:34:38 +02:00
Lucas Käldström 75e8c3f180 Update docker and docker-multinode docs on master to require 1.2.x and use the hyperkube-arch image 2016-01-29 23:01:49 +02:00
Lucas Käldström 7d497441b3 Update docker-multinode instructions and version. Also run kube-proxy in a pod in the docker-multnode manifest 2016-01-11 16:45:56 +02:00
Tim Hockin 8ba250e149 Bump flannel to 0.5.5 in instructions 2015-12-07 14:20:30 -08:00
yangxiangyu c28b75a91f fix ./master.sh: line 125: --data-dir=/var/etcd/data: No such file or directory 2015-11-24 10:29:50 +08:00
He Simei 5ebff99dbf fix etcd flag for ubuntu 2015-11-21 10:17:07 +08:00
He Simei 06b62ef498 upgrade etcd flag for docker-k8s 2015-11-18 16:48:20 +08:00
k8s-merge-robot 724e8a3f3a Merge pull request #17011 from resouer/patch-9 
Auto commit by PR queue bot
 2015-11-12 08:33:14 -08:00
Harry Zhang aa9a6a131d Make master.sh easy to copy 
Make worker.sh easy to copy
 2015-11-11 03:15:53 +00:00
Tim Hockin faa5c5885a Update docs for running under docker 
Make them a bit more version safe.
 2015-11-09 22:08:06 -08:00
Joe Beda 993c1ee222 Update etcd to 2.2.1 2015-11-04 12:26:57 -08:00
k8s-merge-robot 3980d2373d Merge pull request #16368 from fgrzadkowski/test_docker_multinode 
Auto commit by PR queue bot
 2015-10-29 01:31:45 -07:00
Filip Grzadkowski 871dcb472c Fix flags for kubelet in docker-multinode setup. 2015-10-27 15:50:23 +01:00
Filip Grzadkowski 187c32a74a Wait for docker termination when creating network bridges. Currently we might have data races. 2015-10-27 15:44:03 +01:00
He Simei 9c3600d5d3 enhance upstart param for containerized kubelet 2015-10-17 09:52:38 +08:00
He Simei 62a2c47c24 fix #15767 2015-10-16 16:30:02 +08:00
He Simei 31f7d33d29 enhance lsb_release detection for multi-docker 2015-10-12 18:48:37 +08:00
Harry Zhang fcfed739b9 Deal with unsupported os distro 2015-10-08 08:47:45 +00:00
Harry Zhang 22ab92bd16 Fix wrong case statement in master.sh 2015-10-08 16:21:53 +08:00
Alex Robinson 43a985df67 Merge pull request #14492 from fgrzadkowski/upgrade_flannel 
Upgrade flannel to 0.5.3
 2015-10-05 13:35:06 -07:00
He Simei d3f160ff13 add support for amzn 2015-09-25 16:39:50 +08:00
He Simei 0178dba381 add support for CentOS via multi-docker 2015-09-25 13:38:15 +08:00
Filip Grzadkowski 595381d48c Upgrade flannel to 0.5.3 2015-09-24 15:57:27 +02:00
Chao Xu 496296f7f5 Merge pull request #13634 from ZJU-SEL/patch-docker-sh 
Add mount dirs to docker multi-node scripts
 2015-09-08 16:34:16 -07:00
harry c9644b3e5b Add mount dirs to multi-node scripts 2015-09-08 09:50:49 +08:00
harry 365562c0b9 Add default version to scripts 2015-09-07 06:22:48 +00:00
Brendan Burns 868aca04a0 Merge pull request #12687 from eparis/verfiy-dash 
Update flag-dash whitelist
 2015-08-14 10:12:54 +08:00
Lei Zhang 6a2e58552d vxlan as bankend of flannel & auto restart k8s. 2015-08-12 11:16:19 +08:00
He Simei be26f1c5ab fix unsupported param of containerized kubelet 2015-08-08 20:22:02 +08:00
He Simei 52ea1108eb fix upstart param for containerized kebelet 2015-08-02 10:30:04 +08:00
Brendan Burns b9a653bfbc fix a missing 'g' 2015-07-29 13:22:47 -07:00
Harry Zhang e6a2b068cb Fix intend mess in scripts 2015-07-28 10:15:14 +08:00
Harry Zhang 611a41d894 Merge scripts of kube-in-docker with the manual guide 2015-07-28 10:15:14 +08:00