github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce FLANNEL_OTHER_NET_CONFIG

Browse Source 
.. so allow configuration of other fields in, usually,
/coreos.com/network/config in etcd.

Fixes #19618
This commit is contained in:
Mike Spreitzer
2016-01-13 23:39:10 -05:00
parent 5007d7c4a9
commit d4ab9663c4
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/getting-started-guides/ubuntu.md
View File

@@ -145,6 +145,8 @@ that conflicts with your own private network range.
The `FLANNEL_NET` variable defines the IP range used for flannel overlay network,
should not conflict with above `SERVICE_CLUSTER_IP_RANGE`.
You can optionally provide additional Flannel network configuration
through `FLANNEL_OTHER_NET_CONFIG`, as explained in `cluster/ubuntu/config-default.sh`.
**Note:** When deploying, master needs to be connected to the Internet to download the necessary files.
If your machines are located in a private network that need proxy setting to connect the Internet,