Jared
b5c86dfe02
Merge branch 'master' into init-cont-doc
2016-11-21 11:07:51 -08:00
Jared
096e8e21be
Merge branch 'master' into patch-1
2016-11-21 09:25:53 -08:00
Casey Davenport
a8e129af83
Sort network plugins alphabetically. ( #1583 )
2016-11-19 14:52:21 -08:00
Justin Santa Barbara
3ba967e20f
Merge branch 'master' into download_kubectl
2016-11-18 16:09:54 -05:00
Tom von Schwerdtner
8563dd273b
Address formatting
...
Currently the 'sample environment' code block all shows on one line at http://kubernetes.io/docs/getting-started-guides/vsphere/ , hoping this will fix it.
2016-11-17 14:20:29 -05:00
Eric Tune
625774cc1b
Added init container documentation.
...
Based loosely on the design proposal.
2016-11-16 09:52:10 -08:00
Tim Hockin
1c3789e506
Merge branch 'master' into be-more-neutral
2016-11-15 23:56:47 +01:00
Luke Marsden
5dd3a00742
Be more vendor neutral.
...
Address review feedback.
2016-11-11 08:42:32 -08:00
devin-donnelly
c1f1f34414
Merge pull request #1614 from fen4o/fix-rkt-link
...
Fix broken rkt networking link
2016-11-07 11:04:55 -08:00
Lucas Käldström
05f67bad8f
Update the kubeadm documentation to reflect the new release
2016-11-06 15:29:11 -08:00
fen4o
4f6dea72b9
Fix broken rkt networking link
2016-11-03 12:22:29 +02:00
devin-donnelly
05ac6a0aca
Merge pull request #1601 from gershwinlabs/turn-tear
...
Changed "turn down" cluster to "tear down" cluster
2016-11-02 15:17:39 -07:00
Bill
4892b6b82f
Merge branch 'master' into turn-tear
2016-11-02 13:47:52 +00:00
fen4o
078074676b
Fix broken links in Custom Cluster from Scratch
...
* Broken link for Calico
* Added https for Weave
2016-11-02 15:26:40 +02:00
Bill
e7eb93aaf4
Merge branch 'master' into turn-tear
2016-11-01 21:00:36 +00:00
Bill Allen
596a56e3e5
Documentation incorrectly said to turn down the cluster instead of tear down the cluster.
2016-11-01 20:50:53 +00:00
Chris Love
e57b1141c9
Merge branch 'master' into updating-aws-install
2016-11-01 11:54:39 -06:00
Anirudh Ramanathan
b5f9257c11
Add valid link to kops ( #1566 )
2016-11-01 00:49:52 -07:00
Keith Wansbrough
1c7a004312
Merge branch 'master' into patch-1
2016-10-28 11:01:28 +01:00
chrislovecnm
c4da909199
tweaks requested
...
hr
2016-10-27 23:19:33 -06:00
chrislovecnm
f85bbc130c
moving kube-up.sh to legacy for aws install
2016-10-27 23:19:32 -06:00
devin-donnelly
de27c5c194
Merge pull request #1554 from jadekler/master
...
Remove outdated notes
2016-10-27 20:20:08 -07:00
devin-donnelly
3ce1cd3ac5
Merge pull request #1549 from chrismarino/master
...
Add Romana to Network Policy Getting Started and kubeadm install pages
2016-10-27 19:36:55 -07:00
devin-donnelly
2de507a377
Merge pull request #1541 from MichalMankowski/master
...
Fix centos getting started docs
2016-10-27 19:35:49 -07:00
Jean de Klerk
cf716e75d6
Merge branch 'master' into master
2016-10-27 07:44:54 -06:00
Chris Marino
32c2a7d29f
Client glitch again
2016-10-26 13:36:31 -07:00
Chris Marino
6d9c7babe1
Typos, clarity....
2016-10-26 13:35:41 -07:00
Chris Marino
66e1e236a2
More git client weirdness
2016-10-26 08:01:41 -07:00
Chris Marino
714440f3ae
Reworked language...
2016-10-26 08:00:29 -07:00
Chris Marino
a600ad20e6
Resolved conflich
2016-10-26 07:48:11 -07:00
Chris Marino
ee6ce7828f
Merge remote-tracking branch 'refs/remotes/kubernetes/master'
2016-10-26 06:49:09 -07:00
Chris Marino
eb32f1323b
Weird client mishap missed this line...
2016-10-26 06:35:28 -07:00
Justin Santa Barbara
5d689c8eee
Add docs for kops, explain when kops and when kubeadm
...
Quick getting started guide for kops.
Also try to provide some guidance as to when to use kops and when
kubeadm; based on discussions with sig-cluster-lifecycle that kubeadm is
a building block and not a provisioning tool.
I used "kubeadm" as a simplifying concept for "kubeadm and the other
work done by sig-cluster-lifecycle that kubeadm is a part of", in that
tools that don't (yet) use kubeadm are still leveraging the kubeadm
stream of work.
2016-10-25 22:53:33 -04:00
Jean de Klerk
6649f59283
Remove outdated notes
...
The issue in question has been resolved.
2016-10-25 18:41:49 -06:00
Chris Marino
5d7db3f643
Rework..
2016-10-25 15:24:54 -07:00
Chris Marino
e8860fcba0
format
2016-10-25 15:05:23 -07:00
devin-donnelly
a02ae2da29
Merge pull request #1542 from masstomato/typo-docs-centos
...
Fix typo 'ectdclt'
2016-10-25 14:57:32 -07:00
Chris Marino
6a290cd6e7
Remove vendor reference, typo...
2016-10-25 14:55:55 -07:00
Lucas Käldström
519ceca719
Update and refactor the kubeadm documentation + add HypriotOS instructions as well
2016-10-25 22:55:48 +03:00
Chris Marino
f5ab3e9d33
Remove project references...
2016-10-25 09:45:05 -07:00
MichalMankowski
5ff5f10e76
change default-system to default-context
2016-10-25 08:48:43 +02:00
Chris Marino
2232e063aa
Edits for consistency..
...
Kubeadmin, etc.
2016-10-24 16:00:28 -07:00
chrismarino
677699245e
Merge branch 'master' into master
2016-10-24 10:01:27 -07:00
Joe Beda
e21ed27c58
Document kubeadm automation.
2016-10-24 09:41:39 -07:00
Chris Marino
59d40b3e81
Merge remote-tracking branch 'refs/remotes/kubernetes/master'
2016-10-24 08:23:03 -07:00
Chris Marino
b36034a97c
edits
2016-10-24 08:22:22 -07:00
masstomato
d07e6516ce
Merge branch 'master' into typo-docs-centos
2016-10-25 00:22:15 +09:00
Chris Marino
56a8e8bafc
Minor content re-org, edits
2016-10-24 08:22:02 -07:00
MichalMankowski
fff7f38748
change to kube-centos
2016-10-24 16:24:01 +02:00
masstomato
cacbf7ca35
Fix typo
...
Fix 'ectdclt' to 'etcdctl'.
2016-10-24 23:22:37 +09:00