Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
a876f221
Commit
a876f221
authored
Aug 29, 2016
by
Minhan Xia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
keep docker0 with private cidr range
parent
610a978e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+5
-4
No files found.
cluster/gce/gci/configure-helper.sh
View file @
a876f221
...
@@ -378,7 +378,10 @@ function assemble-docker-flags {
...
@@ -378,7 +378,10 @@ function assemble-docker-flags {
docker_opts+
=
" --log-level=warn"
docker_opts+
=
" --log-level=warn"
fi
fi
local
use_net_plugin
=
"true"
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"
use_net_plugin
=
"false"
docker_opts+
=
" --bridge=cbr0"
docker_opts+
=
" --bridge=cbr0"
fi
fi
...
@@ -540,10 +543,8 @@ ExecStart=${kubelet_bin} \$KUBELET_OPTS
...
@@ -540,10 +543,8 @@ ExecStart=${kubelet_bin} \$KUBELET_OPTS
WantedBy=multi-user.target
WantedBy=multi-user.target
EOF
EOF
#
Delete docker0 to avoid interferenc
e
#
Flush iptables nat tabl
e
iptables
-t
nat
-F
||
true
iptables
-t
nat
-F
||
true
ip
link set
docker0 down
||
true
brctl delbr docker0
||
true
systemctl start kubelet.service
systemctl start kubelet.service
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment