Commit a1a7ecaa authored by Lubomir I. Ivanov's avatar Lubomir I. Ivanov

kubeadm: add missing --config flag to mark-control-plane phase

parent 94759c16
...@@ -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>.
......
...@@ -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
......
...@@ -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,
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment