github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74032 from tedyu/master 

Use Set to check whether flag name is allowed flag
pull/564/head
Kubernetes Prow Robot 2019-02-13 20:33:17 -08:00 committed by GitHub
parent 5b600c5ce3 71134a0d05
commit d01b01beb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/kubeadm/app/apis/kubeadm/validation/validation.go
View File

@ -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