github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

keep docker0 with private cidr range

Browse Source
This commit is contained in:
Minhan Xia 2016-08-29 13:57:42 -07:00
parent 610a978e48
commit a876f22102
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/gce/gci/configure-helper.sh
View File

@ -378,7 +378,10 @@ function assemble-docker-flags {
docker_opts+=" --log-level=warn"
fi
local use_net_plugin="true"
if [[ "${NETWORK_PROVIDER:-}" != "kubenet" && "${NETWORK_PROVIDER:-}" != "cni" ]]; then
if [[ "${NETWORK_PROVIDER:-}" == "kubenet" || "${NETWORK_PROVIDER:-}" == "cni" ]]; then
# set docker0 cidr to private ip address range to avoid conflict with cbr0 cidr range
docker_opts+=" --bip=169.254.123.1/24"
else
use_net_plugin="false"
docker_opts+=" --bridge=cbr0"
fi
@ -540,10 +543,8 @@ ExecStart=${kubelet_bin} \$KUBELET_OPTS
WantedBy=multi-user.target
EOF
# Delete docker0 to avoid interference
# Flush iptables nat table
iptables -t nat -F || true
ip link set docker0 down || true
brctl delbr docker0 || true
systemctl start kubelet.service
}