whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into titles-updates

Browse Source
This commit is contained in:
Devin Donnelly
2017-01-09 16:37:20 -08:00
parent 0bb7c0fe08 2ace8a3812
commit 4d95032f4e
11 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/dns.md
+1 -2
View File
@@ -1,8 +1,7 @@
--- ---
assignees: assignees:
- ArtfulCoder
- davidopp - davidopp
- lavalamp - thockin
title: Using DNS Pods and Services title: Using DNS Pods and Services
--- ---
docs/admin/networking.md
-1
View File
@@ -1,6 +1,5 @@
--- ---
assignees: assignees:
- lavalamp
- thockin - thockin
title: Networking in Kubernetes title: Networking in Kubernetes
--- ---
docs/admin/node.md
-1
View File
@@ -2,7 +2,6 @@
assignees: assignees:
- caesarxuchao - caesarxuchao
- dchen1107 - dchen1107
- lavalamp
title: Nodes title: Nodes
--- ---
docs/admin/ovs-networking.md
-1
View File
@@ -1,6 +1,5 @@
--- ---
assignees: assignees:
- lavalamp
- thockin - thockin
title: Kubernetes OpenVSwitch GRE/VxLAN networking title: Kubernetes OpenVSwitch GRE/VxLAN networking
--- ---
docs/admin/salt.md
-1
View File
@@ -1,7 +1,6 @@
--- ---
assignees: assignees:
- davidopp - davidopp
- lavalamp
title: Configuring Kubernetes with Salt title: Configuring Kubernetes with Salt
--- ---
docs/getting-started-guides/aws.md
-1
View File
@@ -1,7 +1,6 @@
--- ---
assignees: assignees:
- justinsb - justinsb
- lavalamp
- clove - clove
title: Running Kubernetes on AWS EC2 title: Running Kubernetes on AWS EC2
--- ---
docs/getting-started-guides/centos/centos_manual_config.md
+10 -7
View File
@@ -1,6 +1,5 @@
--- ---
assignees: assignees:
- lavalamp
- thockin - thockin
title: CentOS title: CentOS
--- ---
@@ -131,15 +130,17 @@ $ etcdctl mk /kube-centos/network/config "{ \"Network\": \"172.30.0.0/16\", \"Su
* Configure flannel to overlay Docker network in /etc/sysconfig/flanneld on the master (also in the nodes as we'll see): * Configure flannel to overlay Docker network in /etc/sysconfig/flanneld on the master (also in the nodes as we'll see):
```shell ```shell
# Flanneld configuration options
# etcd url location. Point this to the server where etcd runs # etcd url location. Point this to the server where etcd runs
FLANNEL_ETCD="http://centos-master:2379" FLANNEL_ETCD_ENDPOINTS="http://centos-master:2379"
# etcd config key. This is the configuration key that flannel queries # etcd config key. This is the configuration key that flannel queries
# For address range assignment # For address range assignment
FLANNEL_ETCD_KEY="/kube-centos/network" FLANNEL_ETCD_PREFIX="/kube-centos/network"
# Any additional options that you want to pass # Any additional options that you want to pass
FLANNEL_OPTIONS="" #FLANNEL_OPTIONS=""
``` ```
* Start the appropriate services on master: * Start the appropriate services on master:
@@ -179,15 +180,17 @@ KUBELET_ARGS=""
* Configure flannel to overlay Docker network in /etc/sysconfig/flanneld (in all the nodes) * Configure flannel to overlay Docker network in /etc/sysconfig/flanneld (in all the nodes)
```shell ```shell
# Flanneld configuration options
# etcd url location. Point this to the server where etcd runs # etcd url location. Point this to the server where etcd runs
FLANNEL_ETCD="http://centos-master:2379" FLANNEL_ETCD_ENDPOINTS="http://centos-master:2379"
# etcd config key. This is the configuration key that flannel queries # etcd config key. This is the configuration key that flannel queries
# For address range assignment # For address range assignment
FLANNEL_ETCD_KEY="/kube-centos/network" FLANNEL_ETCD_PREFIX="/kube-centos/network"
# Any additional options that you want to pass # Any additional options that you want to pass
FLANNEL_OPTIONS="" #FLANNEL_OPTIONS=""
``` ```
* Start the appropriate services on node (centos-minion-n). * Start the appropriate services on node (centos-minion-n).
docs/getting-started-guides/cloudstack.md
-1
View File
@@ -1,6 +1,5 @@
--- ---
assignees: assignees:
- lavalamp
- thockin - thockin
title: Cloudstack title: Cloudstack
--- ---
docs/getting-started-guides/rkt/index.md
-1
View File
@@ -1,6 +1,5 @@
--- ---
assignees: assignees:
- lavalamp
- yifan-gu - yifan-gu
title: Running Kubernetes with rkt title: Running Kubernetes with rkt
--- ---
docs/tasks/index.md
+1
View File
@@ -16,6 +16,7 @@ single thing, typically by giving a short sequence of steps.
* [Pulling an Image from a Private Registry](/docs/tasks/configure-pod-container/pull-image-private-registry/) * [Pulling an Image from a Private Registry](/docs/tasks/configure-pod-container/pull-image-private-registry/)
* [Configuring Liveness and Readiness Probes](/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/) * [Configuring Liveness and Readiness Probes](/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/)
* [Communicating Between Pods Running in the Same Container](/docs/tasks/configure-pod-container/communicate-containers-same-pod/) * [Communicating Between Pods Running in the Same Container](/docs/tasks/configure-pod-container/communicate-containers-same-pod/)
* [Configuring Pod Initialization](/docs/tasks/configure-pod-container/configure-pod-initialization/)
#### Accessing Applications in a Cluster #### Accessing Applications in a Cluster
docs/user-guide/update-demo/index.md
-1
View File
@@ -1,6 +1,5 @@
--- ---
assignees: assignees:
- lavalamp
- mikedanese - mikedanese
title: Rolling Update Demo title: Rolling Update Demo
--- ---