github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #123565 from ah8ad3/update-help-text-kubectl-create-token

Browse Source 
Implement to accept zero as a default value for kubectl create token duration
This commit is contained in:
Kubernetes Prow Robot
2024-02-29 21:51:41 -08:00
committed by GitHub
parent 5fd3bc076b 3b5a79f647
commit 6f42da171b
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/kubectl/pkg/cmd/create/create_token.go
View File

@@ -148,7 +148,7 @@ func NewCmdCreateToken(f cmdutil.Factory, ioStreams genericiooptions.IOStreams)
cmd.Flags().StringArrayVar(&o.Audiences, "audience", o.Audiences, "Audience of the requested token. If unset, defaults to requesting a token for use with the Kubernetes API server. May be repeated to request a token valid for multiple audiences.") cmd.Flags().StringArrayVar(&o.Audiences, "audience", o.Audiences, "Audience of the requested token. If unset, defaults to requesting a token for use with the Kubernetes API server. May be repeated to request a token valid for multiple audiences.")
cmd.Flags().DurationVar(&o.Duration, "duration", o.Duration, "Requested lifetime of the issued token. If not set, the lifetime will be determined by the server automatically. The server may return a token with a longer or shorter lifetime.") cmd.Flags().DurationVar(&o.Duration, "duration", o.Duration, "Requested lifetime of the issued token. If not set or if set to 0, the lifetime will be determined by the server automatically. The server may return a token with a longer or shorter lifetime.")
cmd.Flags().StringVar(&o.BoundObjectKind, "bound-object-kind", o.BoundObjectKind, "Kind of an object to bind the token to. "+ cmd.Flags().StringVar(&o.BoundObjectKind, "bound-object-kind", o.BoundObjectKind, "Kind of an object to bind the token to. "+
"Supported kinds are "+strings.Join(sets.StringKeySet(boundObjectKindToAPIVersions()).List(), ", ")+". "+ "Supported kinds are "+strings.Join(sets.StringKeySet(boundObjectKindToAPIVersions()).List(), ", ")+". "+
@@ -208,8 +208,8 @@ func (o *TokenOptions) Validate() error {
if len(o.Namespace) == 0 { if len(o.Namespace) == 0 {
return fmt.Errorf("--namespace is required") return fmt.Errorf("--namespace is required")
} }
if o.Duration < 0 || (o.Duration == 0 && o.Flags.Changed("duration")) { if o.Duration < 0 {
return fmt.Errorf("--duration must be positive") return fmt.Errorf("--duration must be greater than or equal to 0")
} }
if o.Duration%time.Second != 0 { if o.Duration%time.Second != 0 {
return fmt.Errorf("--duration cannot be expressed in units less than seconds") return fmt.Errorf("--duration cannot be expressed in units less than seconds")

17
staging/src/k8s.io/kubectl/pkg/cmd/create/create_token_test.go
View File

@@ -219,7 +219,7 @@ status:
test: "invalid duration", test: "invalid duration",
name: "mysa", name: "mysa",
duration: -1, duration: -1,
expectStderr: `error: --duration must be positive`, expectStderr: `error: --duration must be greater than or equal to 0`,
}, },
{ {
test: "invalid duration unit", test: "invalid duration unit",
@@ -243,7 +243,22 @@ status:
serverResponseToken: "abc", serverResponseToken: "abc",
expectStdout: "abc", expectStdout: "abc",
}, },
{
test: "zero duration act as default",
name: "mysa",
duration: 0 * time.Second,
expectRequestPath: "/api/v1/namespaces/test/serviceaccounts/mysa/token",
expectTokenRequest: &authenticationv1.TokenRequest{
TypeMeta: metav1.TypeMeta{APIVersion: "authentication.k8s.io/v1", Kind: "TokenRequest"},
Spec: authenticationv1.TokenRequestSpec{
ExpirationSeconds: nil,
},
},
serverResponseToken: "abc",
expectStdout: "abc",
},
{ {
test: "server error", test: "server error",
name: "mysa", name: "mysa",