Skip to content

K
k3s
Commit 71134a0d authored by Ted Yu's avatar Ted Yu Committed by Ted Yu
Browse files
Options

Use Set to check whether flag name is allowed flag

Signed-off-by: 's avatarTed Yu <yute@vmware.com>
parent aefd2811
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 10 deletions
cmd/kubeadm/app/apis/kubeadm/validation/validation.go
View file @ 71134a0d
...@@ -416,23 +416,18 @@ func ValidateMixedArguments(flag *pflag.FlagSet) error { ...@@ -416,23 +416,18 @@ func ValidateMixedArguments(flag *pflag.FlagSet) error {
} }
func isAllowedFlag(flagName string) bool { func isAllowedFlag(flagName string) bool {
isAllowed := false knownFlags := sets.NewString(kubeadmcmdoptions.CfgPath,
switch flagName {
case kubeadmcmdoptions.CfgPath,
kubeadmcmdoptions.IgnorePreflightErrors, kubeadmcmdoptions.IgnorePreflightErrors,
kubeadmcmdoptions.DryRun, kubeadmcmdoptions.DryRun,
kubeadmcmdoptions.KubeconfigPath, kubeadmcmdoptions.KubeconfigPath,
kubeadmcmdoptions.NodeName, kubeadmcmdoptions.NodeName,
kubeadmcmdoptions.NodeCRISocket, kubeadmcmdoptions.NodeCRISocket,
kubeadmcmdoptions.KubeconfigDir, kubeadmcmdoptions.KubeconfigDir,
"print-join-command", "rootfs", "v": "print-join-command", "rootfs", "v")
isAllowed = true if knownFlags.Has(flagName) {
default: return true
if strings.HasPrefix(flagName, "skip-") {
isAllowed = true
}
} }
return isAllowed return strings.HasPrefix(flagName, "skip-")
} }
// ValidateFeatureGates validates provided feature gates // ValidateFeatureGates validates provided feature gates
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment