github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-05 11:12:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19642 from MikeSpreitzer/issue/19618

Browse Source 
Introduce FLANNEL_OTHER_NET_CONFIG
This commit is contained in:
Brendan Burns
2016-01-27 12:20:11 -08:00
parent 266778170b d4ab9663c4
commit 4f845ad6e1
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,