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

Merge pull request #34908 from jansel/flannel_other_net_config

Browse Source 
Automatic merge from submit-queue

Don't overwrite FLANNEL_OTHER_NET_CONFIG in ubuntu config

Make it easier to pass options to flannel through environment variables.
This commit is contained in:
Kubernetes Submit Queue 2016-10-19 01:03:49 -07:00 committed by GitHub
commit c8004a1b7b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/ubuntu/config-default.sh
View File

@ -74,7 +74,7 @@ FLANNEL_BACKEND=''
# FLANNEL_OTHER_NET_CONFIG=', "SubnetMin": "172.16.10.0", "SubnetMax": "172.16.90.0"' # FLANNEL_OTHER_NET_CONFIG=', "SubnetMin": "172.16.10.0", "SubnetMax": "172.16.90.0"'
export FLANNEL_OTHER_NET_CONFIG export FLANNEL_OTHER_NET_CONFIG
FLANNEL_OTHER_NET_CONFIG='' FLANNEL_OTHER_NET_CONFIG=${FLANNEL_OTHER_NET_CONFIG:-""}
# Admission Controllers to invoke prior to persisting objects in # Admission Controllers to invoke prior to persisting objects in
# cluster. If we included ResourceQuota, we should keep it at the end # cluster. If we included ResourceQuota, we should keep it at the end