github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

kubeapiserver: rename --experimental-bootstrap-token-auth to --enable-bootstrap-token-auth.

Browse Source 
This change renames the `--experimental-bootstrap-token-auth` flag to `--enable-bootstrap-token-auth`. The old flag is accepted but generates a warning.

In 1.9, we will drop support for `--experimental-bootstrap-token-auth` entirely.
This commit is contained in:
Matt Moyer 2017-08-23 09:23:14 -05:00
parent 071c8870d9
commit 9dad15e220
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,7 @@ type AnonymousAuthenticationOptions struct {
}
type BootstrapTokenAuthenticationOptions struct {
Allow bool
Enable bool
}
type KeystoneAuthenticationOptions struct {
@ -178,7 +178,11 @@ func (s *BuiltInAuthenticationOptions) AddFlags(fs *pflag.FlagSet) {
}
if s.BootstrapToken != nil {
fs.BoolVar(&s.BootstrapToken.Allow, "experimental-bootstrap-token-auth", s.BootstrapToken.Allow, ""+
fs.BoolVar(&s.BootstrapToken.Enable, "experimental-bootstrap-token-auth", s.BootstrapToken.Enable, ""+
"Deprecated (use --enable-bootstrap-token-auth).")
fs.MarkDeprecated("experimental-bootstrap-token-auth", "use --enable-bootstrap-token-auth instead.")
fs.BoolVar(&s.BootstrapToken.Enable, "enable-bootstrap-token-auth", s.BootstrapToken.Enable, ""+
"Enable to allow secrets of type 'bootstrap.kubernetes.io/token' in the 'kube-system' "+
"namespace to be used for TLS bootstrapping authentication.")
}
@ -266,7 +270,7 @@ func (s *BuiltInAuthenticationOptions) ToAuthenticationConfig() authenticator.Au
}
if s.BootstrapToken != nil {
ret.BootstrapToken = s.BootstrapToken.Allow
ret.BootstrapToken = s.BootstrapToken.Enable
}
if s.ClientCert != nil {