github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #126411 from hoskeri/fix-authnz-configfile-usage-formatting

Browse Source 
Fix formatting of the authnz config usage.
This commit is contained in:
Kubernetes Prow Robot 2024-08-13 21:03:52 -07:00 committed by GitHub
commit 5891e72703
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubeapiserver/options/authentication.go
View File

@ -311,11 +311,10 @@ func (o *BuiltInAuthenticationOptions) AddFlags(fs *pflag.FlagSet) {
fs.StringVar(&o.AuthenticationConfigFile, "authentication-config", o.AuthenticationConfigFile, ""+
"File with Authentication Configuration to configure the JWT Token authenticator or the anonymous authenticator. "+
"Note: This feature is in Alpha since v1.29."+
"--feature-gate=StructuredAuthenticationConfiguration=true needs to be set for enabling this feature."+
"This feature is mutually exclusive with the oidc-* flags."+
"To configure anonymous authenticator you need to enable --feature-gate=AnonymousAuthConfigurableEndpoints."+
"When you configure anonymous authenticator in the authentication config you cannot use the --anonymous-auth flag.")
"Requires the StructuredAuthenticationConfiguration feature gate. "+
"Also requires the feature gate AnonymousAuthConfigurableEndpoints to configure the anonymous authenticator in the config file. "+
"This flag is mutually exclusive with the --oidc-* flags if the file configures the JWT Token authenticator. "+
"This flag is mutually exclusive with --anonymous-auth if the file configures the Anonymous authenticator.")
fs.StringSliceVar(&o.APIAudiences, "api-audiences", o.APIAudiences, ""+
"Identifiers of the API. The service account token authenticator will validate that "+

7
pkg/kubeapiserver/options/authorization.go
View File

@ -188,10 +188,9 @@ func (o *BuiltInAuthorizationOptions) AddFlags(fs *pflag.FlagSet) {
"The duration to cache 'unauthorized' responses from the webhook authorizer.")
fs.StringVar(&o.AuthorizationConfigurationFile, authorizationConfigFlag, o.AuthorizationConfigurationFile, ""+
"File with Authorization Configuration to configure the authorizer chain."+
"Note: This feature is in Alpha since v1.29."+
"--feature-gate=StructuredAuthorizationConfiguration=true feature flag needs to be set to true for enabling the functionality."+
"This feature is mutually exclusive with the other --authorization-mode and --authorization-webhook-* flags.")
"File with Authorization Configuration to configure the authorizer chain. "+
"Requires feature gate StructuredAuthorizationConfiguration. "+
"This flag is mutually exclusive with the other --authorization-mode and --authorization-webhook-* flags.")
// preserves compatibility with any method set during initialization
oldAreLegacyFlagsSet := o.AreLegacyFlagsSet