github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #119443 from SataQiu/fix-kubectl-20230719

Browse Source 
kubectl: ensure '--duration' must be positive for 'kubectl create token' command
This commit is contained in:
Kubernetes Prow Robot 2023-10-09 21:44:12 +02:00 committed by GitHub
commit 46860a27cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import (
"time" "time"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/pflag"
authenticationv1 "k8s.io/api/authentication/v1" authenticationv1 "k8s.io/api/authentication/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -46,6 +47,9 @@ type TokenOptions struct {
PrintFlags *genericclioptions.PrintFlags PrintFlags *genericclioptions.PrintFlags
PrintObj func(obj runtime.Object) error PrintObj func(obj runtime.Object) error
// Flags hold the parsed CLI flags.
Flags *pflag.FlagSet
// Name and namespace of service account to create a token for // Name and namespace of service account to create a token for
Name string Name string
Namespace string Namespace string
@ -137,7 +141,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. 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, 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(boundObjectKindToAPIVersion).List(), ", ")+". "+ "Supported kinds are "+strings.Join(sets.StringKeySet(boundObjectKindToAPIVersion).List(), ", ")+". "+
@ -149,6 +153,8 @@ func NewCmdCreateToken(f cmdutil.Factory, ioStreams genericiooptions.IOStreams)
"Requires --bound-object-kind and --bound-object-name. "+ "Requires --bound-object-kind and --bound-object-name. "+
"If unset, the UID of the existing object is used.") "If unset, the UID of the existing object is used.")
o.Flags = cmd.Flags()
return cmd return cmd
} }
@ -195,7 +201,7 @@ 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 { if o.Duration < 0 || (o.Duration == 0 && o.Flags.Changed("duration")) {
return fmt.Errorf("--duration must be positive") return fmt.Errorf("--duration must be positive")
} }
if o.Duration%time.Second != 0 { if o.Duration%time.Second != 0 {