diff --git a/tools/go.mod b/tools/go.mod index e5de94abd..a3e8fc311 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -217,12 +217,12 @@ require ( k8s.io/apiextensions-apiserver v0.29.0 // indirect k8s.io/apimachinery v0.29.0 // indirect k8s.io/apiserver v0.29.0 // indirect - k8s.io/cli-runtime v0.28.0 // indirect + k8s.io/cli-runtime v0.29.0 // indirect k8s.io/client-go v0.29.0 // indirect k8s.io/component-base v0.29.0 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/kubectl v0.28.0 // indirect + k8s.io/kubectl v0.29.0 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect oras.land/oras-go v1.2.4 // indirect rsc.io/letsencrypt v0.0.3 // indirect diff --git a/tools/go.sum b/tools/go.sum index dee855b5f..c68564688 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -1324,8 +1324,8 @@ k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o= k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= k8s.io/apiserver v0.29.0 h1:Y1xEMjJkP+BIi0GSEv1BBrf1jLU9UPfAnnGGbbDdp7o= k8s.io/apiserver v0.29.0/go.mod h1:31n78PsRKPmfpee7/l9NYEv67u6hOL6AfcE761HapDM= -k8s.io/cli-runtime v0.28.0 h1:Tcz1nnccXZDNIzoH6EwjCs+7ezkUGhorzCweEvlVOFg= -k8s.io/cli-runtime v0.28.0/go.mod h1:U+ySmOKBm/JUCmebhmecXeTwNN1RzI7DW4+OM8Oryas= +k8s.io/cli-runtime v0.29.0 h1:q2kC3cex4rOBLfPOnMSzV2BIrrQlx97gxHJs21KxKS4= +k8s.io/cli-runtime v0.29.0/go.mod h1:VKudXp3X7wR45L+nER85YUzOQIru28HQpXr0mTdeCrk= k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8= k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38= k8s.io/component-base v0.29.0 h1:T7rjd5wvLnPBV1vC4zWd/iWRbV8Mdxs+nGaoaFzGw3s= @@ -1334,8 +1334,8 @@ k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubectl v0.28.0 h1:qhfju0OaU+JGeBlToPeeIg2UJUWP++QwTkpio6nlPKg= -k8s.io/kubectl v0.28.0/go.mod h1:1We+E5nSX3/TVoSQ6y5Bzld5OhTBHZHlKEYl7g/NaTk= +k8s.io/kubectl v0.29.0 h1:Oqi48gXjikDhrBF67AYuZRTcJV4lg2l42GmvsP7FmYI= +k8s.io/kubectl v0.29.0/go.mod h1:0jMjGWIcMIQzmUaMgAzhSELv5WtHo2a8pq67DtviAJs= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY= diff --git a/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go b/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go index 03f4b5332..9c1683509 100644 --- a/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go +++ b/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/config_flags.go @@ -27,6 +27,8 @@ import ( "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/api/meta" + "k8s.io/cli-runtime/pkg/genericiooptions" + "k8s.io/cli-runtime/pkg/printers" "k8s.io/client-go/discovery" diskcached "k8s.io/client-go/discovery/cached/disk" "k8s.io/client-go/rest" @@ -122,6 +124,9 @@ type ConfigFlags struct { // Allows increasing qps used for discovery, this is useful // in clusters with many registered resources discoveryQPS float32 + // Allows all possible warnings are printed in a standardized + // format. + warningPrinter *printers.WarningPrinter } // ToRESTConfig implements RESTClientGetter. @@ -332,7 +337,11 @@ func (f *ConfigFlags) toRESTMapper() (meta.RESTMapper, error) { } mapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient) - expander := restmapper.NewShortcutExpander(mapper, discoveryClient) + expander := restmapper.NewShortcutExpander(mapper, discoveryClient, func(a string) { + if f.warningPrinter != nil { + f.warningPrinter.Print(a) + } + }) return expander, nil } @@ -428,6 +437,12 @@ func (f *ConfigFlags) WithWrapConfigFn(wrapConfigFn func(*rest.Config) *rest.Con return f } +// WithWarningPrinter initializes WarningPrinter with the given IOStreams +func (f *ConfigFlags) WithWarningPrinter(ioStreams genericiooptions.IOStreams) *ConfigFlags { + f.warningPrinter = printers.NewWarningPrinter(ioStreams.ErrOut, printers.WarningPrinterOptions{Color: printers.AllowsColorOutput(ioStreams.ErrOut)}) + return f +} + // NewConfigFlags returns ConfigFlags with default values set func NewConfigFlags(usePersistentConfig bool) *ConfigFlags { impersonateGroup := []string{} diff --git a/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/config_flags_fake.go b/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/config_flags_fake.go index 7a9648155..9bb5e28c9 100644 --- a/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/config_flags_fake.go +++ b/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/config_flags_fake.go @@ -66,7 +66,7 @@ func (f *TestConfigFlags) ToRESTMapper() (meta.RESTMapper, error) { } if f.discoveryClient != nil { mapper := restmapper.NewDeferredDiscoveryRESTMapper(f.discoveryClient) - expander := restmapper.NewShortcutExpander(mapper, f.discoveryClient) + expander := restmapper.NewShortcutExpander(mapper, f.discoveryClient, nil) return expander, nil } return nil, fmt.Errorf("no restmapper") diff --git a/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/io_options.go b/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/io_options.go index 3d3e20a2f..b83135139 100644 --- a/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/io_options.go +++ b/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/io_options.go @@ -18,7 +18,7 @@ package genericclioptions import ( "bytes" - "io/ioutil" + "io" "k8s.io/cli-runtime/pkg/genericiooptions" ) @@ -48,7 +48,7 @@ func NewTestIOStreamsDiscard() genericiooptions.IOStreams { in := &bytes.Buffer{} return IOStreams{ In: in, - Out: ioutil.Discard, - ErrOut: ioutil.Discard, + Out: io.Discard, + ErrOut: io.Discard, } } diff --git a/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/jsonpath_flags.go b/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/jsonpath_flags.go index 06bef474a..a3d86d761 100644 --- a/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/jsonpath_flags.go +++ b/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/jsonpath_flags.go @@ -18,7 +18,7 @@ package genericclioptions import ( "fmt" - "io/ioutil" + "os" "sort" "strings" @@ -88,7 +88,7 @@ func (f *JSONPathPrintFlags) ToPrinter(templateFormat string) (printers.Resource } if templateFormat == "jsonpath-file" { - data, err := ioutil.ReadFile(templateValue) + data, err := os.ReadFile(templateValue) if err != nil { return nil, fmt.Errorf("error reading --template %s, %v", templateValue, err) } diff --git a/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/template_flags.go b/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/template_flags.go index 4502061ec..9d670daa4 100644 --- a/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/template_flags.go +++ b/tools/vendor/k8s.io/cli-runtime/pkg/genericclioptions/template_flags.go @@ -18,7 +18,7 @@ package genericclioptions import ( "fmt" - "io/ioutil" + "os" "sort" "strings" @@ -89,7 +89,7 @@ func (f *GoTemplatePrintFlags) ToPrinter(templateFormat string) (printers.Resour } if templateFormat == "templatefile" || templateFormat == "go-template-file" { - data, err := ioutil.ReadFile(templateValue) + data, err := os.ReadFile(templateValue) if err != nil { return nil, fmt.Errorf("error reading --template %s, %v", templateValue, err) } diff --git a/tools/vendor/k8s.io/cli-runtime/pkg/printers/terminal.go b/tools/vendor/k8s.io/cli-runtime/pkg/printers/terminal.go index 5a59491e4..9dc904e59 100644 --- a/tools/vendor/k8s.io/cli-runtime/pkg/printers/terminal.go +++ b/tools/vendor/k8s.io/cli-runtime/pkg/printers/terminal.go @@ -18,7 +18,11 @@ package printers import ( "io" + "os" + "runtime" "strings" + + "github.com/moby/term" ) // terminalEscaper replaces ANSI escape sequences and other terminal special @@ -37,3 +41,35 @@ func WriteEscaped(writer io.Writer, output string) error { func EscapeTerminal(in string) string { return terminalEscaper.Replace(in) } + +// IsTerminal returns whether the passed object is a terminal or not +func IsTerminal(i interface{}) bool { + _, terminal := term.GetFdInfo(i) + return terminal +} + +// AllowsColorOutput returns true if the specified writer is a terminal and +// the process environment indicates color output is supported and desired. +func AllowsColorOutput(w io.Writer) bool { + if !IsTerminal(w) { + return false + } + + // https://en.wikipedia.org/wiki/Computer_terminal#Dumb_terminals + if os.Getenv("TERM") == "dumb" { + return false + } + + // https://no-color.org/ + if _, nocolor := os.LookupEnv("NO_COLOR"); nocolor { + return false + } + + // On Windows WT_SESSION is set by the modern terminal component. + // Older terminals have poor support for UTF-8, VT escape codes, etc. + if runtime.GOOS == "windows" && os.Getenv("WT_SESSION") == "" { + return false + } + + return true +} diff --git a/tools/vendor/k8s.io/kubectl/pkg/cmd/util/factory.go b/tools/vendor/k8s.io/kubectl/pkg/cmd/util/factory.go index cd806d620..e6414f3e0 100644 --- a/tools/vendor/k8s.io/kubectl/pkg/cmd/util/factory.go +++ b/tools/vendor/k8s.io/kubectl/pkg/cmd/util/factory.go @@ -62,8 +62,10 @@ type Factory interface { // Returns a schema that can validate objects stored on disk. Validator(validationDirective string) (validation.Schema, error) - // OpenAPISchema returns the parsed openapi schema definition - OpenAPISchema() (openapi.Resources, error) + + // Used for retrieving openapi v2 resources. + openapi.OpenAPIResourcesGetter + // OpenAPIV3Schema returns a client for fetching parsed schemas for // any group version OpenAPIV3Client() (openapiclient.Client, error) diff --git a/tools/vendor/k8s.io/kubectl/pkg/cmd/util/factory_client_access.go b/tools/vendor/k8s.io/kubectl/pkg/cmd/util/factory_client_access.go index 3943fc30f..6a1646b84 100644 --- a/tools/vendor/k8s.io/kubectl/pkg/cmd/util/factory_client_access.go +++ b/tools/vendor/k8s.io/kubectl/pkg/cmd/util/factory_client_access.go @@ -154,13 +154,8 @@ func (f *factoryImpl) Validator(validationDirective string) (validation.Schema, return validation.NullSchema{}, nil } - resources, err := f.OpenAPISchema() - if err != nil { - return nil, err - } - schema := validation.ConjunctiveSchema{ - validation.NewSchemaValidation(resources), + validation.NewSchemaValidation(f), validation.NoDoubleKeySchema{}, } @@ -219,5 +214,5 @@ func (f *factoryImpl) OpenAPIV3Client() (openapiclient.Client, error) { return nil, err } - return discovery.OpenAPIV3(), nil + return cached.NewClient(discovery.OpenAPIV3()), nil } diff --git a/tools/vendor/k8s.io/kubectl/pkg/cmd/util/helpers.go b/tools/vendor/k8s.io/kubectl/pkg/cmd/util/helpers.go index 43f72f54e..6d38fade3 100644 --- a/tools/vendor/k8s.io/kubectl/pkg/cmd/util/helpers.go +++ b/tools/vendor/k8s.io/kubectl/pkg/cmd/util/helpers.go @@ -425,13 +425,25 @@ func GetPodRunningTimeoutFlag(cmd *cobra.Command) (time.Duration, error) { type FeatureGate string const ( - ApplySet FeatureGate = "KUBECTL_APPLYSET" - CmdPluginAsSubcommand FeatureGate = "KUBECTL_ENABLE_CMD_SHADOW" - InteractiveDelete FeatureGate = "KUBECTL_INTERACTIVE_DELETE" + ApplySet FeatureGate = "KUBECTL_APPLYSET" + CmdPluginAsSubcommand FeatureGate = "KUBECTL_ENABLE_CMD_SHADOW" + InteractiveDelete FeatureGate = "KUBECTL_INTERACTIVE_DELETE" + OpenAPIV3Patch FeatureGate = "KUBECTL_OPENAPIV3_PATCH" + RemoteCommandWebsockets FeatureGate = "KUBECTL_REMOTE_COMMAND_WEBSOCKETS" ) +// IsEnabled returns true iff environment variable is set to true. +// All other cases, it returns false. func (f FeatureGate) IsEnabled() bool { - return os.Getenv(string(f)) == "true" + return strings.ToLower(os.Getenv(string(f))) == "true" +} + +// IsDisabled returns true iff environment variable is set to false. +// All other cases, it returns true. +// This function is used for the cases where feature is enabled by default, +// but it may be needed to provide a way to ability to disable this feature. +func (f FeatureGate) IsDisabled() bool { + return strings.ToLower(os.Getenv(string(f))) == "false" } func AddValidateFlags(cmd *cobra.Command) { diff --git a/tools/vendor/k8s.io/kubectl/pkg/util/openapi/openapi.go b/tools/vendor/k8s.io/kubectl/pkg/util/openapi/openapi.go index de2fffad8..74955da36 100644 --- a/tools/vendor/k8s.io/kubectl/pkg/util/openapi/openapi.go +++ b/tools/vendor/k8s.io/kubectl/pkg/util/openapi/openapi.go @@ -24,6 +24,13 @@ import ( "sigs.k8s.io/yaml" ) +// OpenAPIResourcesGetter represents a function to return +// OpenAPI V2 resource specifications. Used for lazy-loading +// these resource specifications. +type OpenAPIResourcesGetter interface { + OpenAPISchema() (Resources, error) +} + // Resources interface describe a resources provider, that can give you // resource based on group-version-kind. type Resources interface { diff --git a/tools/vendor/k8s.io/kubectl/pkg/util/term/term.go b/tools/vendor/k8s.io/kubectl/pkg/util/term/term.go index 6bcda59d7..93a992fe3 100644 --- a/tools/vendor/k8s.io/kubectl/pkg/util/term/term.go +++ b/tools/vendor/k8s.io/kubectl/pkg/util/term/term.go @@ -19,7 +19,8 @@ package term import ( "io" "os" - "runtime" + + "k8s.io/cli-runtime/pkg/printers" "github.com/moby/term" @@ -56,46 +57,23 @@ type TTY struct { // IsTerminalIn returns true if t.In is a terminal. Does not check /dev/tty // even if TryDev is set. func (t TTY) IsTerminalIn() bool { - return IsTerminal(t.In) + return printers.IsTerminal(t.In) } // IsTerminalOut returns true if t.Out is a terminal. Does not check /dev/tty // even if TryDev is set. func (t TTY) IsTerminalOut() bool { - return IsTerminal(t.Out) + return printers.IsTerminal(t.Out) } -// IsTerminal returns whether the passed object is a terminal or not -func IsTerminal(i interface{}) bool { - _, terminal := term.GetFdInfo(i) - return terminal -} +// IsTerminal returns whether the passed object is a terminal or not. +// Deprecated: use printers.IsTerminal instead. +var IsTerminal = printers.IsTerminal // AllowsColorOutput returns true if the specified writer is a terminal and // the process environment indicates color output is supported and desired. -func AllowsColorOutput(w io.Writer) bool { - if !IsTerminal(w) { - return false - } - - // https://en.wikipedia.org/wiki/Computer_terminal#Dumb_terminals - if os.Getenv("TERM") == "dumb" { - return false - } - - // https://no-color.org/ - if _, nocolor := os.LookupEnv("NO_COLOR"); nocolor { - return false - } - - // On Windows WT_SESSION is set by the modern terminal component. - // Older terminals have poor support for UTF-8, VT escape codes, etc. - if runtime.GOOS == "windows" && os.Getenv("WT_SESSION") == "" { - return false - } - - return true -} +// Deprecated: use printers.AllowsColorOutput instead. +var AllowsColorOutput = printers.AllowsColorOutput // Safe invokes the provided function and will attempt to ensure that when the // function returns (or a termination signal is sent) that the terminal state diff --git a/tools/vendor/k8s.io/kubectl/pkg/validation/validation.go b/tools/vendor/k8s.io/kubectl/pkg/validation/validation.go index 3ba3213d4..47c74e5b8 100644 --- a/tools/vendor/k8s.io/kubectl/pkg/validation/validation.go +++ b/tools/vendor/k8s.io/kubectl/pkg/validation/validation.go @@ -29,14 +29,14 @@ import ( // schemaValidation validates the object against an OpenAPI schema. type schemaValidation struct { - resources openapi.Resources + resourcesGetter openapi.OpenAPIResourcesGetter } // NewSchemaValidation creates a new Schema that can be used // to validate objects. -func NewSchemaValidation(resources openapi.Resources) Schema { +func NewSchemaValidation(resourcesGetter openapi.OpenAPIResourcesGetter) Schema { return &schemaValidation{ - resources: resources, + resourcesGetter: resourcesGetter, } } @@ -56,7 +56,6 @@ func (v *schemaValidation) ValidateBytes(data []byte) error { if (gvk == schema.GroupVersionKind{Version: "v1", Kind: "List"}) { return utilerrors.NewAggregate(v.validateList(obj)) } - return utilerrors.NewAggregate(v.validateResource(obj, gvk)) } @@ -81,7 +80,12 @@ func (v *schemaValidation) validateList(object interface{}) []error { } func (v *schemaValidation) validateResource(obj interface{}, gvk schema.GroupVersionKind) []error { - resource := v.resources.LookupResource(gvk) + // This lazy-loads the OpenAPI V2 specifications, caching the specs. + resources, err := v.resourcesGetter.OpenAPISchema() + if err != nil { + return []error{err} + } + resource := resources.LookupResource(gvk) if resource == nil { // resource is not present, let's just skip validation. return nil diff --git a/tools/vendor/modules.txt b/tools/vendor/modules.txt index ef673f6ce..948248456 100644 --- a/tools/vendor/modules.txt +++ b/tools/vendor/modules.txt @@ -1446,8 +1446,8 @@ k8s.io/apiserver/pkg/util/feature k8s.io/apiserver/pkg/util/webhook k8s.io/apiserver/pkg/util/x509metrics k8s.io/apiserver/pkg/warning -# k8s.io/cli-runtime v0.28.0 -## explicit; go 1.20 +# k8s.io/cli-runtime v0.29.0 +## explicit; go 1.21 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers @@ -1647,8 +1647,8 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kubectl v0.28.0 -## explicit; go 1.20 +# k8s.io/kubectl v0.29.0 +## explicit; go 1.21 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme k8s.io/kubectl/pkg/util/deployment