diff options
| author | lixiaobing10051267 <li.xiaobing1@zte.com.cn> | 2016-07-12 10:55:00 +0800 |
|---|---|---|
| committer | lixiaobing10051267 <li.xiaobing1@zte.com.cn> | 2016-07-12 10:55:00 +0800 |
| commit | 7f15526a26ee8d8d8cd044fd4aa40808494d9c79 (patch) | |
| tree | e3bf0d73fa735ca009b81f7e61dd0722400859e3 | |
| parent | 74c85ce73e8d443e195b8e89ccff8bca693ba0f7 (diff) | |
Flannel doc description cidr modify
| -rwxr-xr-x[-rw-r--r--] | flannel-integration.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/flannel-integration.md b/flannel-integration.md index 9d89b443..7c8be0fd 100644..100755 --- a/flannel-integration.md +++ b/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 |