Skip to content

Commit

Permalink
Merge pull request #48946 from mattmoyer/automated-cherry-pick-of-#48…
Browse files Browse the repository at this point in the history
…915-upstream-release-1.7

Automatic merge from submit-queue

Automated cherry pick of #48915

Cherry pick of #48915 on release-1.7.

#48915: kubeadm: fix broken `kubeadm init --config` flag.
  • Loading branch information
Kubernetes Submit Queue committed Jul 17, 2017
2 parents f550b1b + aaf699d commit 2e4bb9a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ type Init struct {

// Validate validates configuration passed to "kubeadm init"
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 validation.ValidateMasterConfiguration(i.cfg).ToAggregate()
Expand Down

0 comments on commit 2e4bb9a

Please sign in to comment.