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
6b2df1cf
Unverified
Commit
6b2df1cf
authored
May 02, 2017
by
Derek McQuay
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kubeadm: move preflight kubelet check
parent
8f6df267
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
init.go
cmd/kubeadm/app/cmd/init.go
+3
-3
join.go
cmd/kubeadm/app/cmd/join.go
+3
-3
No files found.
cmd/kubeadm/app/cmd/init.go
View file @
6b2df1cf
...
...
@@ -175,13 +175,13 @@ func NewInit(cfgPath string, cfg *kubeadmapi.MasterConfiguration, skipPreFlight,
if
err
:=
preflight
.
RunInitMasterChecks
(
cfg
);
err
!=
nil
{
return
nil
,
err
}
// Try to start the kubelet service in case it's inactive
preflight
.
TryStartKubelet
()
}
else
{
fmt
.
Println
(
"[preflight] Skipping pre-flight checks"
)
}
// Try to start the kubelet service in case it's inactive
preflight
.
TryStartKubelet
()
return
&
Init
{
cfg
:
cfg
,
skipTokenPrint
:
skipTokenPrint
},
nil
}
...
...
cmd/kubeadm/app/cmd/join.go
View file @
6b2df1cf
...
...
@@ -156,13 +156,13 @@ func NewJoin(cfgPath string, args []string, cfg *kubeadmapi.NodeConfiguration, s
if
err
:=
preflight
.
RunJoinNodeChecks
(
cfg
);
err
!=
nil
{
return
nil
,
err
}
// Try to start the kubelet service in case it's inactive
preflight
.
TryStartKubelet
()
}
else
{
fmt
.
Println
(
"[preflight] Skipping pre-flight checks"
)
}
// Try to start the kubelet service in case it's inactive
preflight
.
TryStartKubelet
()
return
&
Join
{
cfg
:
cfg
},
nil
}
...
...
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