77 Commits

Author	SHA1	Message	Date
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
k8s-merge-robot	d246ed00fa	Merge pull request #18894 from luxas/update_master_multi ... Auto commit by PR queue bot	2016-01-11 20:38:41 -08: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
Chao Xu	2b2f285777	run hack/update-generated-docs.sh	2015-12-21 10:41:30 -08:00
Tim Hockin	8ba250e149	Bump flannel to 0.5.5 in instructions	2015-12-07 14:20:30 -08:00
k8s-merge-robot	2ddc61e941	Merge pull request #17663 from yanns/patch-1 ... Auto commit by PR queue bot	2015-11-24 10:34:43 -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
Yann Simon	63e7a5ec90	remove trailing space ... the trailing space break the command in zsh at least	2015-11-23 18:19:45 +01: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	229f0f22ad	Merge pull request #17100 from idvoretskyi/patch-2 ... Auto commit by PR queue bot	2015-11-15 00:36:25 -08:00
Tim Hockin	dab591b629	Run update-gendocs	2015-11-13 13:57:57 -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
Ihor Dvoretskyi	74f57bc314	Update master.md ... Alternative way to restart docker service is added.	2015-11-11 09:49:01 +02: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
Janet Kuo	a01d339216	Update tutorial about kubectl expose	2015-10-27 14:28:32 -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	7c9903bd02	mount /var/lib/docker rw	2015-10-17 09:53:04 +08: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
k8s-merge-robot	891cef4efa	Merge pull request #13530 from goltermann/docs ... Auto commit by PR queue bot	2015-09-08 19:19:15 -07: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
goltermann	bec4c10dc4	Replace IRC with Slack in docs.	2015-09-08 15:17:39 -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
He Simei	ffe9bb0e25	upgrade to v1.0.3, refactor the guide	2015-08-28 16:43:01 +08:00
Ed Costello	1916d3bb74	Copy edits for typos (resubmitted)	2015-08-25 10:47:58 -04: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
Filip Grzadkowski	9dd3cac82e	Merge pull request #12423 from brendandburns/service ... Make services print on a single line.	2015-08-11 10:29:23 +02:00
Brendan Burns	79fb674679	Fix the service printer to be a single line per service	2015-08-10 10:57:45 -07:00
He Simei	be26f1c5ab	fix unsupported param of containerized kubelet	2015-08-08 20:22:02 +08:00
David Walter	792fc2269b	change underscores to dashes to match the command line argument	2015-08-06 22:13:44 -05:00
Marek Grabowski	bff79366f7	Merge pull request #12128 from ZJU-SEL/containerized-kubelet-param ... fix upstart param for containerized kebelet	2015-08-03 14:37:48 +02:00
He Simei	52ea1108eb	fix upstart param for containerized kebelet	2015-08-02 10:30:04 +08:00
Eric Paris	024208e39f	Fix trailing whitespace in all docs	2015-07-30 20:41:30 -04:00
Brendan Burns	fa6ee98ddc	Update worker.sh	2015-07-29 13:23:06 -07: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