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
9dbe6fe4
Commit
9dbe6fe4
authored
Jun 23, 2015
by
Dawn Chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added more comments.
parent
8d76d4ee
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
init.sls
cluster/saltbase/salt/kube-master-addons/init.sls
+8
-1
container_bridge.go
pkg/kubelet/container_bridge.go
+3
-0
No files found.
cluster/saltbase/salt/kube-master-addons/init.sls
View file @
9dbe6fe4
...
...
@@ -39,10 +39,17 @@ master-docker-image-tags:
# Current containervm image by default has both docker and kubelet
# running. But during cluster creation stage, docker and kubelet
# could be overwritten completely, or restarted due flag changes.
# could be overwritten completely, or restarted due
to
flag changes.
# The ordering of salt states for service docker, kubelet and
# master-addon below is very important to avoid the race between
# salt restart docker or kubelet and kubelet start master components.
# Without the ordering of salt states, when gce instance boot up,
# configure-vm.sh will run and download the release. At the end of
# boot, run-salt will run kube-master-addons service which installs
# master component manifest files to kubelet config directory before
# the installation of proper version kubelet. Please see
# https://github.com/GoogleCloudPlatform/kubernetes/issues/10122#issuecomment-114566063
# for detail explanation on this very issue.
kube-master-addons:
service.running:
- enable: True
...
...
pkg/kubelet/container_bridge.go
View file @
9dbe6fe4
...
...
@@ -85,6 +85,9 @@ func ensureCbr0(wantCIDR *net.IPNet) error {
return
nil
}
// Check if cbr0 network interface is configured or not, and take action
// when the configuration is missing on the node, and propagate the rest
// error to kubelet to handle.
func
cbr0Exists
()
(
bool
,
error
)
{
if
_
,
err
:=
os
.
Stat
(
"/sys/class/net/cbr0"
);
err
!=
nil
{
if
os
.
IsNotExist
(
err
)
{
...
...
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