Allow config and ignore-preflight to be specified together

In commit 3a0aa06f, 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.

Allow config and ignore-preflight to be specified together
6ec2bdf9 · Davanum Srinivas · 76287fed · 6ec2bdf9
Commit 6ec2bdf9 authored Nov 28, 2017 by Davanum Srinivas
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

validation.go cmd/kubeadm/app/apis/kubeadm/validation/validation.go +1 -1

No files found.
--- 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
 		}