From 6ec2bdf9db9172ef563ca62a0cc7fcab45d635df Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 28 Nov 2017 21:22:16 -0500 Subject: [PATCH] Allow config and ignore-preflight to be specified together In commit 3a0aa06fc9cb78738ba542db6154f71f5d1b92ea, the flag was changed from `ignore-checks-errors` to `ignore-preflight-errors`, but the condition check in ValidateMixedArguments was not updated. So specifying say `--config kubeadm.conf --ignore-preflight-errors all` would fail. --- 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 f7b9ab21072..3220b41aab4 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go +++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go @@ -315,7 +315,7 @@ func ValidateMixedArguments(flag *pflag.FlagSet) error { mixedInvalidFlags := []string{} flag.Visit(func(f *pflag.Flag) { - if f.Name == "config" || strings.HasPrefix(f.Name, "ignore-checks-") || strings.HasPrefix(f.Name, "skip-") || f.Name == "dry-run" || f.Name == "kubeconfig" { + if f.Name == "config" || f.Name == "ignore-preflight-errors" || strings.HasPrefix(f.Name, "skip-") || f.Name == "dry-run" || f.Name == "kubeconfig" { // "--skip-*" flags or other whitelisted flags can be set with --config return }