Commit Graph

401 Commits

Author SHA1 Message Date
devin-donnelly b98c2aeaaa Merge pull request #1673 from harryge00/patch-2
Update dns.md
2016-12-21 16:18:12 -08:00
devin-donnelly 100d3dc7b6 Merge branch 'master' into non-masquerade-cidr 2016-12-21 16:11:53 -08:00
devin-donnelly d427b0e2e4 Merge pull request #1888 from CaoShuFeng/roleRef
[authorization] update doc about roleRef
2016-12-21 15:20:44 -08:00
devin-donnelly d7543653b4 Merge pull request #1893 from derekwaynecarr/quota-by-storage-class
Document quota by storage class
2016-12-21 15:16:16 -08:00
devin-donnelly ea26037f2e Merge branch 'master' into linkify-github-issue 2016-12-21 15:12:50 -08:00
devin-donnelly 80395355c6 Merge pull request #1907 from bibryam/dns-doc
Fixed typos
2016-12-21 15:12:07 -08:00
devin-donnelly 8170aaa50e Merge pull request #1961 from InQuicker/kubelet-auth-formatting
Fix the formatting of bullet lists on the kubelet auth page.
2016-12-21 17:25:42 -05:00
devin-donnelly 2fc412b5fb Merge pull request #1978 from shettyg/docs
networking.md: Add OVN as a networking plugin option.
2016-12-21 17:23:18 -05:00
devin-donnelly 8afbb0adb5 Merge pull request #2010 from luojie233/branch2
Duplicated 'the'
2016-12-21 17:04:06 -05:00
devin-donnelly 221038bfa9 Merge pull request #2002 from bibryam/various-typos
Small typos fixed
2016-12-21 17:00:10 -05:00
devin-donnelly 619c3ea3b1 Merge branch 'master' into branch2 2016-12-21 16:55:29 -05:00
Jie Luo 757f101117 fix some typos
Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-21 16:37:06 +08:00
Jie Luo ccd202a07a Duplicated 'the'
Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-21 14:33:37 +08:00
Bilgin Ibryam b4e6c6e1c7 Fixed cricial to critical 2016-12-21 06:24:43 +00:00
devin-donnelly d3f9bdfe24 Merge pull request #2001 from chentao1596/kubelet-static-pod-config
static-pod: --config should be changed to -pod-manifest-path
2016-12-20 19:25:50 -05:00
devin-donnelly 40e658f12d Merge pull request #2000 from xialonglee/cancel-italic-title
Delete italic style markdown symbol
2016-12-20 19:25:22 -05:00
devin-donnelly 71f32c8618 Merge pull request #2004 from nlamirault/patch-1
Fix kube-dns component name
2016-12-20 16:07:17 -05:00
devin-donnelly fc7d0698e4 Merge branch 'master' into calico-addon-link 2016-12-20 15:59:58 -05:00
Nicolas Lamirault fd5e585ebf Fix kube-dns component name 2016-12-20 11:29:44 +01:00
Bilgin Ibryam b413c7eecb Small typos fixed 2016-12-20 08:47:16 +00:00
chentao 4f59dd333f change to new config 2016-12-20 16:41:51 +08:00
Gunjan Patel 09bb00cea2 Merge branch 'master' into calico-addon-link 2016-12-19 23:53:29 -08:00
xialong.lee 231b924608 delete italic style 2016-12-20 09:55:11 +08:00
Ben Balter 5bab707a82 Merge branch 'master' into inline-titles 2016-12-19 18:46:34 -05:00
Lucas Käldström 09e40e26b3 Update the kubeadm documentation to v1.5 2016-12-16 16:29:28 +02:00
Gurucharan Shetty 27d614a4f5 networking.md: Add OVN as a networking plugin option.
OVN is an opensource network virtualization solution
developed by the Open vSwitch community.  It lets one
create logical switches, logical routers, stateful
ACLs, load-balancers etc to build different virtual
networking topologies.  The project has a specific
Kubernetes plugin and documentation at
https://github.com/openvswitch/ovn-kubernetes.
2016-12-15 23:32:24 -08:00
Ben Balter b301f4ad3a add notitle attribute to pages that shouldnt have a title 2016-12-15 17:06:04 -05:00
Gunjan Patel 56fac4ee23 Merge branch 'master' into calico-addon-link 2016-12-15 13:46:27 -08:00
Jared 74317d519d Merge branch 'master' into defalut-version-1.5 2016-12-15 13:40:02 -08:00
gunjan5 668e1a27dd Update Calico docs link 2016-12-15 13:25:49 -08:00
Janet Kuo 9b432f24e6 Remove .0 suffix from all references to {{page.version}} 2016-12-15 13:14:47 -08:00
Ben Balter bfa604351f add explicit titles to docs 2016-12-15 15:16:54 -05:00
Jared 8a70253a30 Merge branch 'master' into patch-1 2016-12-15 12:06:16 -08:00
Jared edbf9471ac Merge branch 'master' into patch-1 2016-12-15 12:03:50 -08:00
Jared b7a9a4bd4f Merge branch 'master' into patch-1 2016-12-15 12:03:35 -08:00
Jared c3ec5e82cc Merge branch 'master' into kubefed-fixes 2016-12-15 11:53:51 -08:00
Joe Rocklin 01bfb7925f Fix link to nuage
previous markdown resulted in a relative reference, which lead to a 404.
2016-12-15 11:47:10 -05:00
dbaumgarten 061a332ac4 Wrong path for cloud-config in kubeadm.md
The cloud-config file should be located under `/etc/kubernetes/cloud-config` instead of /etc/kubernetes/cloud-config.json.
(See: https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/master/manifests.go#L41 )
If the file is not in this location the controller-manager will fail to start, as he is given the --cloud-provider option without --cloud-config. (--cloud-config will only be used when  `/etc/kubernetes/cloud-config` exists https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/master/manifests.go#L367 )
2016-12-15 14:58:46 +01:00
Jimmy Cuadra a1dededa56 Fix the formatting of bullet lists on the kubelet auth page. 2016-12-14 15:52:22 -08:00
Janet Kuo f664e4c65a In DaemonSet doc, link to node selection doc instead of repo 2016-12-14 11:21:28 -08:00
Madhusudan.C.S 93ffad35f2 Fix URL typo and whitespace. 2016-12-13 15:27:23 -08:00
Jared 2389d7a5d4 Merge branch 'master' into quota-by-storage-class 2016-12-13 15:07:37 -08:00
Jared 998f8698ff Merge branch 'master' into linkify-github-issue 2016-12-13 15:06:07 -08:00
Jared 682e1355aa Merge branch 'master' into dns-doc 2016-12-13 15:04:48 -08:00
Jared 04f6af0948 Merge branch 'master' into fix-typo 2016-12-13 14:59:15 -08:00
Janet Kuo 6535ffad28 Merge branch 'master' into update-generated-docs 2016-12-13 13:56:50 -08:00
Janet Kuo 28899d6ec6 Run update-imported-docs.sh 2016-12-13 13:44:13 -08:00
hasahni dd1fa0039d Add Nuage as a networking plugin for Kubernetes. (#1849) 2016-12-13 11:06:35 -08:00
Peter Lee ba1ce0bd5d Merge branch 'master' into fix-typo 2016-12-13 22:46:24 +08:00
xialong.lee fb7cca7a2f fix-typo 2016-12-10 14:40:48 +08:00