From 71134a0d05a504c1eb235eebfc61ef1771eedbd5 Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Wed, 13 Feb 2019 13:01:18 -0800 Subject: [PATCH] Use Set to check whether flag name is allowed flag Signed-off-by: Ted Yu --- .../app/apis/kubeadm/validation/validation.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go index b77aebf45e..dfc696ddcf 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go +++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go @@ -416,23 +416,18 @@ func ValidateMixedArguments(flag *pflag.FlagSet) error { } func isAllowedFlag(flagName string) bool { - isAllowed := false - switch flagName { - case kubeadmcmdoptions.CfgPath, + knownFlags := sets.NewString(kubeadmcmdoptions.CfgPath, kubeadmcmdoptions.IgnorePreflightErrors, kubeadmcmdoptions.DryRun, kubeadmcmdoptions.KubeconfigPath, kubeadmcmdoptions.NodeName, kubeadmcmdoptions.NodeCRISocket, kubeadmcmdoptions.KubeconfigDir, - "print-join-command", "rootfs", "v": - isAllowed = true - default: - if strings.HasPrefix(flagName, "skip-") { - isAllowed = true - } + "print-join-command", "rootfs", "v") + if knownFlags.Has(flagName) { + return true } - return isAllowed + return strings.HasPrefix(flagName, "skip-") } // ValidateFeatureGates validates provided feature gates