Merge pull request kubernetes#83060 from m3ngyang/mode-valid

k8s-ci-robot · web-flow · commit 06fc5b7f1784 · 2019-09-24T11:45:38.000-07:00
to use existing validating function
diff --git a/pkg/kubeapiserver/options/authorization.go b/pkg/kubeapiserver/options/authorization.go
@@ -55,10 +55,9 @@ func (s *BuiltInAuthorizationOptions) Validate() []error {
 		allErrors = append(allErrors, fmt.Errorf("at least one authorization-mode must be passed"))
 	}
 
-	allowedModes := sets.NewString(authzmodes.AuthorizationModeChoices...)
 	modes := sets.NewString(s.Modes...)
 	for _, mode := range s.Modes {
-		if !allowedModes.Has(mode) {
+		if !authzmodes.IsValidAuthorizationMode(mode) {
 			allErrors = append(allErrors, fmt.Errorf("authorization-mode %q is not a valid mode", mode))
 		}
 		if mode == authzmodes.ModeABAC {

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,9 @@ func (s *BuiltInAuthorizationOptions) Validate() []error {`
`55`	`55`	`allErrors = append(allErrors, fmt.Errorf("at least one authorization-mode must be passed"))`
`56`	`56`	`}`
`57`	`57`
`58`		`- allowedModes := sets.NewString(authzmodes.AuthorizationModeChoices...)`
`59`	`58`	`modes := sets.NewString(s.Modes...)`
`60`	`59`	`for _, mode := range s.Modes {`
`61`		`- if !allowedModes.Has(mode) {`
	`60`	`+ if !authzmodes.IsValidAuthorizationMode(mode) {`
`62`	`61`	`allErrors = append(allErrors, fmt.Errorf("authorization-mode %q is not a valid mode", mode))`
`63`	`62`	`}`
`64`	`63`	`if mode == authzmodes.ModeABAC {`