From 98d2cb6f44e3ca0407db9339251a527a2821bb6a Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Mon, 9 Jan 2017 15:14:38 -0800 Subject: [PATCH 1/3] Remove lavalamp from docs he doesn't know anything about --- docs/admin/dns.md | 3 +-- docs/admin/networking.md | 1 - docs/admin/node.md | 1 - docs/admin/ovs-networking.md | 1 - docs/admin/salt.md | 1 - docs/getting-started-guides/aws.md | 1 - docs/getting-started-guides/centos/centos_manual_config.md | 1 - docs/getting-started-guides/cloudstack.md | 1 - docs/getting-started-guides/rkt/index.md | 1 - docs/user-guide/update-demo/index.md | 1 - 10 files changed, 1 insertion(+), 11 deletions(-) diff --git a/docs/admin/dns.md b/docs/admin/dns.md index cc8972ef2c..407c439b73 100644 --- a/docs/admin/dns.md +++ b/docs/admin/dns.md @@ -1,8 +1,7 @@ --- assignees: -- ArtfulCoder - davidopp -- lavalamp +- thockin title: Using DNS Pods and Services --- diff --git a/docs/admin/networking.md b/docs/admin/networking.md index e1de39fdbd..08b3d1442e 100644 --- a/docs/admin/networking.md +++ b/docs/admin/networking.md @@ -1,6 +1,5 @@ --- assignees: -- lavalamp - thockin title: Networking in Kubernetes --- diff --git a/docs/admin/node.md b/docs/admin/node.md index cbb70229e7..0923169256 100644 --- a/docs/admin/node.md +++ b/docs/admin/node.md @@ -2,7 +2,6 @@ assignees: - caesarxuchao - dchen1107 -- lavalamp title: Nodes --- diff --git a/docs/admin/ovs-networking.md b/docs/admin/ovs-networking.md index 9370dcec46..8ae71cc186 100644 --- a/docs/admin/ovs-networking.md +++ b/docs/admin/ovs-networking.md @@ -1,6 +1,5 @@ --- assignees: -- lavalamp - thockin title: Kubernetes OpenVSwitch GRE/VxLAN networking --- diff --git a/docs/admin/salt.md b/docs/admin/salt.md index ba4d4fe227..d2479ffff2 100644 --- a/docs/admin/salt.md +++ b/docs/admin/salt.md @@ -1,7 +1,6 @@ --- assignees: - davidopp -- lavalamp title: Configuring Kubernetes with Salt --- diff --git a/docs/getting-started-guides/aws.md b/docs/getting-started-guides/aws.md index 214cb00145..aabbe8a8bc 100644 --- a/docs/getting-started-guides/aws.md +++ b/docs/getting-started-guides/aws.md @@ -1,7 +1,6 @@ --- assignees: - justinsb -- lavalamp - clove title: Running Kubernetes on AWS EC2 --- diff --git a/docs/getting-started-guides/centos/centos_manual_config.md b/docs/getting-started-guides/centos/centos_manual_config.md index 756aa4b248..9b2516113e 100644 --- a/docs/getting-started-guides/centos/centos_manual_config.md +++ b/docs/getting-started-guides/centos/centos_manual_config.md @@ -1,6 +1,5 @@ --- assignees: -- lavalamp - thockin title: CentOS --- diff --git a/docs/getting-started-guides/cloudstack.md b/docs/getting-started-guides/cloudstack.md index 4dd542f127..19c292d1f3 100644 --- a/docs/getting-started-guides/cloudstack.md +++ b/docs/getting-started-guides/cloudstack.md @@ -1,6 +1,5 @@ --- assignees: -- lavalamp - thockin title: Cloudstack --- diff --git a/docs/getting-started-guides/rkt/index.md b/docs/getting-started-guides/rkt/index.md index 2e6a473370..7be07d857d 100644 --- a/docs/getting-started-guides/rkt/index.md +++ b/docs/getting-started-guides/rkt/index.md @@ -1,6 +1,5 @@ --- assignees: -- lavalamp - yifan-gu title: Running Kubernetes with rkt --- diff --git a/docs/user-guide/update-demo/index.md b/docs/user-guide/update-demo/index.md index 3ecd743855..7f0952348c 100644 --- a/docs/user-guide/update-demo/index.md +++ b/docs/user-guide/update-demo/index.md @@ -1,6 +1,5 @@ --- assignees: -- lavalamp - mikedanese title: Rolling Update Demo --- From b4568d9a87f75b6b15a021cbb4585a172cf64c02 Mon Sep 17 00:00:00 2001 From: steveperry-53 Date: Mon, 9 Jan 2017 15:20:42 -0800 Subject: [PATCH 2/3] Add new topic to Task index page. --- docs/tasks/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tasks/index.md b/docs/tasks/index.md index 3215f0b026..2482a13677 100644 --- a/docs/tasks/index.md +++ b/docs/tasks/index.md @@ -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/) * [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/) +* [Configuring Pod Initialization](/docs/tasks/configure-pod-container/configure-pod-initialization/) #### Accessing Applications in a Cluster From bb7631d74e90f64a84e8ffa53c5959cd4103121a Mon Sep 17 00:00:00 2001 From: Alexander Ilyin Date: Mon, 9 Jan 2017 15:55:10 -0800 Subject: [PATCH 3/3] Example of `/etc/sysconfig/flanneld` is not valid (#2135) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Example of `/etc/sysconfig/flanneld` is not valid Configuration keys were different, I got those errors when followed steps from docs: ``` [ailyin@elite ~]$ systemctl status flanneld.service ● flanneld.service - Flanneld overlay address etcd agent Loaded: loaded (/usr/lib/systemd/system/flanneld.service; enabled; vendor preset: disabled) Active: activating (start) since Wed 2017-01-04 19:00:21 EST; 34s ago Main PID: 4668 (flanneld) Memory: 3.5M CGroup: /system.slice/flanneld.service └─4668 /usr/bin/flanneld -etcd-endpoints= -etcd-prefix= Jan 04 19:00:46 elite.dev flanneld[4668]: E0104 19:00:46.395562 04668 network.go:53] Failed to retrieve network config: client: etcd cluster is unavailable or misconfigured Jan 04 19:00:47 elite.dev flanneld[4668]: E0104 19:00:47.395788 04668 network.go:53] Failed to retrieve network config: client: etcd cluster is unavailable or misconfigured Jan 04 19:00:48 elite.dev flanneld[4668]: E0104 19:00:48.395990 04668 network.go:53] Failed to retrieve network config: client: etcd cluster is unavailable or misconfigured Jan 04 19:00:49 elite.dev flanneld[4668]: E0104 19:00:49.396141 04668 network.go:53] Failed to retrieve network config: client: etcd cluster is unavailable or misconfigured Jan 04 19:00:50 elite.dev flanneld[4668]: E0104 19:00:50.396306 04668 network.go:53] Failed to retrieve network config: client: etcd cluster is unavailable or misconfigured Jan 04 19:00:51 elite.dev flanneld[4668]: E0104 19:00:51.396451 04668 network.go:53] Failed to retrieve network config: client: etcd cluster is unavailable or misconfigured Jan 04 19:00:52 elite.dev flanneld[4668]: E0104 19:00:52.396572 04668 network.go:53] Failed to retrieve network config: client: etcd cluster is unavailable or misconfigured Jan 04 19:00:53 elite.dev flanneld[4668]: E0104 19:00:53.396701 04668 network.go:53] Failed to retrieve network config: client: etcd cluster is unavailable or misconfigured Jan 04 19:00:54 elite.dev flanneld[4668]: E0104 19:00:54.396855 04668 network.go:53] Failed to retrieve network config: client: etcd cluster is unavailable or misconfigured Jan 04 19:00:55 elite.dev flanneld[4668]: E0104 19:00:55.396992 04668 network.go:53] Failed to retrieve network config: client: etcd cluster is unavailable or misconfigured ``` * Updated Flanneld configuration example for node (same as for master); --- .../centos/centos_manual_config.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/getting-started-guides/centos/centos_manual_config.md b/docs/getting-started-guides/centos/centos_manual_config.md index 756aa4b248..85b05154b6 100644 --- a/docs/getting-started-guides/centos/centos_manual_config.md +++ b/docs/getting-started-guides/centos/centos_manual_config.md @@ -131,15 +131,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): ```shell +# Flanneld configuration options + # 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 # For address range assignment -FLANNEL_ETCD_KEY="/kube-centos/network" +FLANNEL_ETCD_PREFIX="/kube-centos/network" # Any additional options that you want to pass -FLANNEL_OPTIONS="" +#FLANNEL_OPTIONS="" ``` * Start the appropriate services on master: @@ -179,15 +181,17 @@ KUBELET_ARGS="" * Configure flannel to overlay Docker network in /etc/sysconfig/flanneld (in all the nodes) ```shell +# Flanneld configuration options + # 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 # For address range assignment -FLANNEL_ETCD_KEY="/kube-centos/network" +FLANNEL_ETCD_PREFIX="/kube-centos/network" # Any additional options that you want to pass -FLANNEL_OPTIONS="" +#FLANNEL_OPTIONS="" ``` * Start the appropriate services on node (centos-minion-n).