From ae35377ef563d04e5c98cb0cb7528a792786c741 Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Thu, 13 Jul 2017 16:14:42 -0700 Subject: [PATCH] kubeadm: fix broken `kubeadm init --config` flag. This code was changed in ea196490a0fc1117f4a7c75c24230f0d7ecb17c3 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. --- cmd/kubeadm/app/cmd/init.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go index 38ce55a5608..38587ca0953 100644 --- a/cmd/kubeadm/app/cmd/init.go +++ b/cmd/kubeadm/app/cmd/init.go @@ -206,7 +206,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()