From eacff9436e91e571c2e14b34204228c920fbed9a Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 10 Oct 2018 15:49:18 +0300 Subject: [PATCH] kubeadm: allow usage --config with --print-join-command kubeadm token create --print-join-command --config fails with Error: can not mix '--config' with arguments [print-join-command] As print-joint command can't be put into the configuration file it should be possible to use those 2 options at the same time. Added print-join-command options to the list of exceptions in ValidateMixedArguments check to allow its usage with --config option. Fixes: kubernetes/kubeadm#1166 --- cmd/kubeadm/app/apis/kubeadm/validation/validation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go index 5ecff3728b..ec5729e148 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go +++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go @@ -380,7 +380,7 @@ func ValidateMixedArguments(flag *pflag.FlagSet) error { mixedInvalidFlags := []string{} flag.Visit(func(f *pflag.Flag) { - if f.Name == "config" || f.Name == "ignore-preflight-errors" || strings.HasPrefix(f.Name, "skip-") || f.Name == "dry-run" || f.Name == "kubeconfig" || f.Name == "v" || f.Name == "rootfs" { + if f.Name == "config" || f.Name == "ignore-preflight-errors" || strings.HasPrefix(f.Name, "skip-") || f.Name == "dry-run" || f.Name == "kubeconfig" || f.Name == "v" || f.Name == "rootfs" || f.Name == "print-join-command" { // "--skip-*" flags or other whitelisted flags can be set with --config return }