Skip to content

K
k3s
Commit ae35377e authored by Matt Moyer's avatar Matt Moyer
Browse files
Options

kubeadm: fix broken `kubeadm init --config` flag.

This code was changed in ea196490 to validate that `--config` wasn't passed along with other flags. Unfortunately, the implementation was checking `PersistentFlags()`, which was not parsed at the point it was being validated. The result was that `--config` was _always_ rejected, not just when it was specified alongside other flags. The fix is to use `Flags()` instead, which contains the expected data.
parent f5757bce
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmd/kubeadm/app/cmd/init.go
View file @ ae35377e
...@@ -206,7 +206,7 @@ type Init struct { ...@@ -206,7 +206,7 @@ type Init struct {
// Validate validates configuration passed to "kubeadm init" // Validate validates configuration passed to "kubeadm init"
func (i *Init) Validate(cmd *cobra.Command) error { func (i *Init) Validate(cmd *cobra.Command) error {
if err := validation.ValidateMixedArguments(cmd.PersistentFlags()); err != nil { if err := validation.ValidateMixedArguments(cmd.Flags()); err != nil {
return err return err
} }
return validation.ValidateMasterConfiguration(i.cfg).ToAggregate() return validation.ValidateMasterConfiguration(i.cfg).ToAggregate()
......
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