From b23420a15cfb0a539e6fb0e98e6c7b1ac9fcb3bf Mon Sep 17 00:00:00 2001 From: Jason Ansel Date: Fri, 14 Oct 2016 20:52:46 -0700 Subject: [PATCH] Don't overwrite FLANNEL_OTHER_NET_CONFIG in ubuntu config --- cluster/ubuntu/config-default.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/ubuntu/config-default.sh b/cluster/ubuntu/config-default.sh index 9bf1ce0fb46..82338da1b3c 100755 --- a/cluster/ubuntu/config-default.sh +++ b/cluster/ubuntu/config-default.sh @@ -64,7 +64,7 @@ export FLANNEL_NET=${FLANNEL_NET:-172.16.0.0/16} # FLANNEL_OTHER_NET_CONFIG=', "SubnetMin": "172.16.10.0", "SubnetMax": "172.16.90.0"' 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 cluster # If we included ResourceQuota, we should keep it at the end of the list to prevent incrementing quota usage prematurely.