Merge pull request #56536 from dims/fix-kubeadm-cli-mixed-validation

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. 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. **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes https://github.com/kubernetes/kubeadm/issues/577 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #56536 from dims/fix-kubeadm-cli-mixed-validation
6af5b9ce · Kubernetes Submit Queue · GitHub · 2aeace40 · 6ec2bdf9 · 6af5b9ce
Unverified Commit 6af5b9ce authored Nov 29, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 29, 2017
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
 		}