diff options
| author | k8s-merge-robot <k8s.production.user@gmail.com> | 2016-07-21 16:35:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 16:35:48 -0700 |
| commit | 374c20507f095ea270ec94b33080f477ff95b2a0 (patch) | |
| tree | 24daed117e9290573f0205740e5f56364f766421 | |
| parent | 2480fd47341d9c921c132ce05d79baed6dd24784 (diff) | |
| parent | 7f15526a26ee8d8d8cd044fd4aa40808494d9c79 (diff) | |
Merge pull request #28814 from lixiaobing10051267/mastercidr
Automatic merge from submit-queue
Flannel doc description cidr modify
File "docs\proposals\flannel-integration.md", line 123, "node controller backs off cidr allocation", here cidr is not easy to understand, can be modified to CIDR.
| -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 45f4f003..0468ac09 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 |