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
584a8673
Unverified
Commit
584a8673
authored
Oct 25, 2018
by
k8s-ci-robot
Committed by
GitHub
Oct 25, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #70071 from xichengliudui/fix18102203
Fix grammatical errors and repeat words
parents
63e9ecab
7946697e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
runner.go
cmd/kubeadm/app/cmd/phases/workflow/runner.go
+1
-1
flags.go
cmd/kubeadm/app/phases/kubelet/flags.go
+1
-1
checks.go
cmd/kubeadm/app/preflight/checks.go
+1
-1
No files found.
cmd/kubeadm/app/cmd/phases/workflow/runner.go
View file @
584a8673
...
@@ -84,7 +84,7 @@ type phaseRunner struct {
...
@@ -84,7 +84,7 @@ type phaseRunner struct {
selfPath
[]
string
selfPath
[]
string
// generatedName is the full name of the phase, that corresponds to the absolute
// generatedName is the full name of the phase, that corresponds to the absolute
// path of the phase in the
the
workflow managed by the Runner.
// path of the phase in the workflow managed by the Runner.
generatedName
string
generatedName
string
// use is the phase usage string that will be printed in the workflow help.
// use is the phase usage string that will be printed in the workflow help.
...
...
cmd/kubeadm/app/phases/kubelet/flags.go
View file @
584a8673
...
@@ -43,7 +43,7 @@ type kubeletFlagsOpts struct {
...
@@ -43,7 +43,7 @@ type kubeletFlagsOpts struct {
defaultHostname
string
defaultHostname
string
}
}
// WriteKubeletDynamicEnvFile writes a environment file with dynamic flags to the kubelet.
// WriteKubeletDynamicEnvFile writes a
n
environment file with dynamic flags to the kubelet.
// Used at "kubeadm init" and "kubeadm join" time.
// Used at "kubeadm init" and "kubeadm join" time.
func
WriteKubeletDynamicEnvFile
(
nodeRegOpts
*
kubeadmapi
.
NodeRegistrationOptions
,
featureGates
map
[
string
]
bool
,
registerTaintsUsingFlags
bool
,
kubeletDir
string
)
error
{
func
WriteKubeletDynamicEnvFile
(
nodeRegOpts
*
kubeadmapi
.
NodeRegistrationOptions
,
featureGates
map
[
string
]
bool
,
registerTaintsUsingFlags
bool
,
kubeletDir
string
)
error
{
hostName
,
err
:=
nodeutil
.
GetHostname
(
""
)
hostName
,
err
:=
nodeutil
.
GetHostname
(
""
)
...
...
cmd/kubeadm/app/preflight/checks.go
View file @
584a8673
...
@@ -1027,7 +1027,7 @@ func RunRootCheckOnly(ignorePreflightErrors sets.String) error {
...
@@ -1027,7 +1027,7 @@ func RunRootCheckOnly(ignorePreflightErrors sets.String) error {
return
RunChecks
(
checks
,
os
.
Stderr
,
ignorePreflightErrors
)
return
RunChecks
(
checks
,
os
.
Stderr
,
ignorePreflightErrors
)
}
}
// RunPullImagesCheck will pull images kubeadm needs if the are not found on the system
// RunPullImagesCheck will pull images kubeadm needs if the
y
are not found on the system
func
RunPullImagesCheck
(
execer
utilsexec
.
Interface
,
cfg
*
kubeadmapi
.
InitConfiguration
,
ignorePreflightErrors
sets
.
String
)
error
{
func
RunPullImagesCheck
(
execer
utilsexec
.
Interface
,
cfg
*
kubeadmapi
.
InitConfiguration
,
ignorePreflightErrors
sets
.
String
)
error
{
containerRuntime
,
err
:=
utilruntime
.
NewContainerRuntime
(
utilsexec
.
New
(),
cfg
.
GetCRISocket
())
containerRuntime
,
err
:=
utilruntime
.
NewContainerRuntime
(
utilsexec
.
New
(),
cfg
.
GetCRISocket
())
if
err
!=
nil
{
if
err
!=
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