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
a1a7ecaa
Commit
a1a7ecaa
authored
Nov 24, 2018
by
Lubomir I. Ivanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kubeadm: add missing --config flag to mark-control-plane phase
parent
94759c16
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
constant.go
cmd/kubeadm/app/cmd/options/constant.go
+1
-1
generic.go
cmd/kubeadm/app/cmd/options/generic.go
+1
-1
markcontrolplane.go
cmd/kubeadm/app/cmd/phases/markcontrolplane.go
+1
-0
No files found.
cmd/kubeadm/app/cmd/options/constant.go
View file @
a1a7ecaa
...
@@ -31,7 +31,7 @@ const APIServerExtraArgs = "apiserver-extra-args"
...
@@ -31,7 +31,7 @@ const APIServerExtraArgs = "apiserver-extra-args"
// CertificatesDir flag sets the path where to save and read the certificates.
// CertificatesDir flag sets the path where to save and read the certificates.
const
CertificatesDir
=
"cert-dir"
const
CertificatesDir
=
"cert-dir"
// CfgPath flag sets the path to kubeadm config file.
WARNING: Usage of a configuration file is experimental.
// CfgPath flag sets the path to kubeadm config file.
const
CfgPath
=
"config"
const
CfgPath
=
"config"
// ControllerManagerExtraArgs flag sets extra flags to pass to the Controller Manager or override default ones in form of <flagname>=<value>.
// ControllerManagerExtraArgs flag sets extra flags to pass to the Controller Manager or override default ones in form of <flagname>=<value>.
...
...
cmd/kubeadm/app/cmd/options/generic.go
View file @
a1a7ecaa
...
@@ -33,7 +33,7 @@ func AddKubeConfigDirFlag(fs *pflag.FlagSet, kubeConfigDir *string) {
...
@@ -33,7 +33,7 @@ func AddKubeConfigDirFlag(fs *pflag.FlagSet, kubeConfigDir *string) {
// AddConfigFlag adds the --config flag to the given flagset
// AddConfigFlag adds the --config flag to the given flagset
func
AddConfigFlag
(
fs
*
pflag
.
FlagSet
,
cfgPath
*
string
)
{
func
AddConfigFlag
(
fs
*
pflag
.
FlagSet
,
cfgPath
*
string
)
{
fs
.
StringVar
(
cfgPath
,
CfgPath
,
*
cfgPath
,
"Path to
kubeadm config file (WARNING: Usage of a configuration file is experimental)
."
)
fs
.
StringVar
(
cfgPath
,
CfgPath
,
*
cfgPath
,
"Path to
a kubeadm configuration file
."
)
}
}
// AddIgnorePreflightErrorsFlag adds the --ignore-preflight-errors flag to the given flagset
// AddIgnorePreflightErrorsFlag adds the --ignore-preflight-errors flag to the given flagset
...
...
cmd/kubeadm/app/cmd/phases/markcontrolplane.go
View file @
a1a7ecaa
...
@@ -50,6 +50,7 @@ func NewMarkControlPlanePhase() workflow.Phase {
...
@@ -50,6 +50,7 @@ func NewMarkControlPlanePhase() workflow.Phase {
Example
:
markControlPlaneExample
,
Example
:
markControlPlaneExample
,
InheritFlags
:
[]
string
{
InheritFlags
:
[]
string
{
options
.
NodeName
,
options
.
NodeName
,
options
.
CfgPath
,
},
},
Run
:
runMarkControlPlane
,
Run
:
runMarkControlPlane
,
}
}
...
...
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