mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 18:02:01 +00:00
Merge pull request #74032 from tedyu/master
Use Set to check whether flag name is allowed flag
This commit is contained in:
commit
d01b01beb2
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user