Skip to content

K
k3s
Commit c8004a1b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #34908 from jansel/flannel_other_net_config

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.
parents 61e01130 b23420a1
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cluster/ubuntu/config-default.sh
View file @ c8004a1b
...@@ -74,7 +74,7 @@ FLANNEL_BACKEND='' ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment