From 0f5cbfb461ba1387fd6017698c6871fb74ca900b Mon Sep 17 00:00:00 2001 From: lixiaobing10051267 Date: Tue, 12 Jul 2016 10:55:00 +0800 Subject: [PATCH] Flannel doc description cidr modify --- docs/proposals/flannel-integration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 docs/proposals/flannel-integration.md diff --git a/docs/proposals/flannel-integration.md b/docs/proposals/flannel-integration.md old mode 100644 new mode 100755 index 9d89b4433cf..7c8be0fd3a6 --- a/docs/proposals/flannel-integration.md +++ b/docs/proposals/flannel-integration.md @@ -120,7 +120,7 @@ From 1000 feet: __But will it blend?__ Kubernetes integration is fairly straight-forward once we understand the pieces involved, and can be prioritized as follows: -* Kubelet understands flannel daemon in client mode, flannel server manages independent etcd store on master, node controller backs off cidr allocation +* Kubelet understands flannel daemon in client mode, flannel server manages independent etcd store on master, node controller backs off CIDR allocation * Flannel server consults the Kubernetes master for everything network related * Flannel daemon works through network plugins in a generic way without bothering the kubelet: needs CNI x Kubernetes standardization