Merge branch 'kubernetes-sigs:master' into rate-deadline

Author: levenleven

.github/workflows/main.yml

@@ -14,20 +14,19 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       -
         name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
       -
         name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v4
         with:
           version: latest
-          args: release --rm-dist -f release/goreleaser.yml
+          args: release --clean -f release/goreleaser.yml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

.golangci.yml

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 run:
-  deadline: 30m
+  timeout: 30m
 
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.
@@ -14,7 +14,7 @@ linters:
     - dogsled
     - dupl
     - errcheck
-    - exportloopref
+    - copyloopvar
     - gochecknoinits
     - goconst
     - gocritic
@@ -46,6 +46,8 @@ linters-settings:
     line-length: 170
   gocyclo:
     min-complexity: 30
+  copyloopvar:
+    check-alias: true
 
 issues:
   # List of regexps of issue texts to exclude, empty list by default.
@@ -54,4 +56,4 @@ issues:
   # excluded by default patterns execute `golangci-lint run --help`
   exclude:
     - "Using the variable on range scope `tc` in function literal"
-    - "unused-parameter: parameter"
+    - "unused-parameter: parameter"

Makefile

@@ -10,13 +10,13 @@ export PATH := $(MYGOBIN):$(PATH)
 all: generate license fix vet fmt test lint tidy
 
 "$(MYGOBIN)/stringer":
-	go install golang.org/x/tools/cmd/stringer@v0.1.10
+	go install golang.org/x/tools/cmd/stringer@v0.12.0
 
 "$(MYGOBIN)/addlicense":
 	go install github.com/google/[email protected]
 
 "$(MYGOBIN)/golangci-lint":
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.3
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2
 
 "$(MYGOBIN)/deepcopy-gen":
 	go install k8s.io/code-generator/cmd/[email protected]

cmd/apply/cmdapply.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"sigs.k8s.io/cli-utils/cmd/flagutils"
@@ -22,7 +22,7 @@ import (
 )
 
 func GetRunner(factory cmdutil.Factory, invFactory inventory.ClientFactory,
-	loader manifestreader.ManifestLoader, ioStreams genericclioptions.IOStreams) *Runner {
+	loader manifestreader.ManifestLoader, ioStreams genericiooptions.IOStreams) *Runner {
 	r := &Runner{
 		ioStreams:  ioStreams,
 		factory:    factory,
@@ -66,13 +66,13 @@ func GetRunner(factory cmdutil.Factory, invFactory inventory.ClientFactory,
 }
 
 func Command(f cmdutil.Factory, invFactory inventory.ClientFactory, loader manifestreader.ManifestLoader,
-	ioStreams genericclioptions.IOStreams) *cobra.Command {
+	ioStreams genericiooptions.IOStreams) *cobra.Command {
 	return GetRunner(f, invFactory, loader, ioStreams).Command
 }
 
 type Runner struct {
 	Command    *cobra.Command
-	ioStreams  genericclioptions.IOStreams
+	ioStreams  genericiooptions.IOStreams
 	factory    cmdutil.Factory
 	invFactory inventory.ClientFactory
 	loader     manifestreader.ManifestLoader

cmd/destroy/cmddestroy.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"sigs.k8s.io/cli-utils/cmd/flagutils"
@@ -23,7 +23,7 @@ import (
 
 // GetRunner creates and returns the Runner which stores the cobra command.
 func GetRunner(factory cmdutil.Factory, invFactory inventory.ClientFactory,
-	loader manifestreader.ManifestLoader, ioStreams genericclioptions.IOStreams) *Runner {
+	loader manifestreader.ManifestLoader, ioStreams genericiooptions.IOStreams) *Runner {
 	r := &Runner{
 		ioStreams:  ioStreams,
 		factory:    factory,
@@ -57,14 +57,14 @@ func GetRunner(factory cmdutil.Factory, invFactory inventory.ClientFactory,
 
 // Command creates the Runner, returning the cobra command associated with it.
 func Command(f cmdutil.Factory, invFactory inventory.ClientFactory, loader manifestreader.ManifestLoader,
-	ioStreams genericclioptions.IOStreams) *cobra.Command {
+	ioStreams genericiooptions.IOStreams) *cobra.Command {
 	return GetRunner(f, invFactory, loader, ioStreams).Command
 }
 
 // Runner encapsulates data necessary to run the destroy command.
 type Runner struct {
 	Command    *cobra.Command
-	ioStreams  genericclioptions.IOStreams
+	ioStreams  genericiooptions.IOStreams
 	factory    cmdutil.Factory
 	invFactory inventory.ClientFactory
 	loader     manifestreader.ManifestLoader

cmd/diff/cmddiff.go

@@ -7,7 +7,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/klog/v2"
 	"k8s.io/kubectl/pkg/cmd/diff"
 	"k8s.io/kubectl/pkg/cmd/util"
@@ -20,7 +20,7 @@ const tmpDirPrefix = "diff-cmd"
 // NewCommand returns cobra command to implement client-side diff of package
 // directory. For each local config file, get the resource in the cluster
 // and diff the local config resource against the resource in the cluster.
-func NewCommand(f util.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
+func NewCommand(f util.Factory, ioStreams genericiooptions.IOStreams) *cobra.Command {
 	options := diff.NewDiffOptions(ioStreams)
 	cmd := &cobra.Command{
 		Use:                   "diff (DIRECTORY | STDIN)",
@@ -73,10 +73,7 @@ func Initialize(o *diff.DiffOptions, f util.Factory, args []string) (func(), err
 	}
 	o.FilenameOptions = filenameFlags.ToOptions()
 
-	o.OpenAPISchema, err = f.OpenAPISchema()
-	if err != nil {
-		return cleanupFunc, err
-	}
+	o.OpenAPIGetter = f
 
 	o.DynamicClient, err = f.DynamicClient()
 	if err != nil {

cmd/flagutils/utils.go

@@ -15,6 +15,9 @@ const (
 	InventoryPolicyStrict     = "strict"
 	InventoryPolicyAdopt      = "adopt"
 	InventoryPolicyForceAdopt = "force-adopt"
+	StatusPolicyFlag          = "status-policy"
+	StatusPolicyAll           = "all"
+	StatusPolicyNone          = "none"
 )
 
 // ConvertPropagationPolicy converts a propagationPolicy described as a
@@ -47,6 +50,19 @@ func ConvertInventoryPolicy(policy string) (inventory.Policy, error) {
 	}
 }
 
+// ConvertStatusPolicy converts as status policy described as a string to a
+// StatusPolicy type that is passed into the Applier.
+func ConvertStatusPolicy(policy string) (inventory.StatusPolicy, error) {
+	switch policy {
+	case StatusPolicyNone:
+		return inventory.StatusPolicyNone, nil
+	case StatusPolicyAll:
+		return inventory.StatusPolicyAll, nil
+	default:
+		return inventory.StatusPolicyAll, fmt.Errorf("status policy must be one of none, all")
+	}
+}
+
 // PathFromArgs returns the path which is a positional arg from args list
 // returns "-" if there is length of args is 0, which implies no path is provided
 func PathFromArgs(args []string) string {

cmd/initcmd/cmdinit.go

@@ -5,7 +5,7 @@ package initcmd
 
 import (
 	"github.com/spf13/cobra"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"sigs.k8s.io/cli-utils/pkg/config"
@@ -19,7 +19,7 @@ type InitRunner struct {
 
 // GetInitRunner builds and returns the InitRunner. Connects the InitOptions.Run
 // to the cobra command.
-func GetInitRunner(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *InitRunner {
+func GetInitRunner(f cmdutil.Factory, ioStreams genericiooptions.IOStreams) *InitRunner {
 	io := config.NewInitOptions(f, ioStreams)
 	cmd := &cobra.Command{
 		Use:                   "init DIRECTORY",
@@ -42,6 +42,6 @@ func GetInitRunner(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *In
 }
 
 // NewCmdInit returns the cobra command for the init command.
-func NewCmdInit(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
+func NewCmdInit(f cmdutil.Factory, ioStreams genericiooptions.IOStreams) *cobra.Command {
 	return GetInitRunner(f, ioStreams).Command
 }

cmd/main.go

@@ -13,6 +13,11 @@ import (
 
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
+
+	// This is here rather than in the libraries because of
+	// https://github.com/kubernetes-sigs/kustomize/issues/2060
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"k8s.io/client-go/rest"
 	"k8s.io/component-base/cli"
 	"k8s.io/klog/v2"
@@ -26,10 +31,6 @@ import (
 	"sigs.k8s.io/cli-utils/pkg/flowcontrol"
 	"sigs.k8s.io/cli-utils/pkg/inventory"
 	"sigs.k8s.io/cli-utils/pkg/manifestreader"
-
-	// This is here rather than in the libraries because of
-	// https://github.com/kubernetes-sigs/kustomize/issues/2060
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
 )
 
 func main() {
@@ -55,7 +56,7 @@ func main() {
 	// Update ConfigFlags before subcommands run that talk to the server.
 	preRunE := newConfigFilerPreRunE(f, kubeConfigFlags)
 
-	ioStreams := genericclioptions.IOStreams{
+	ioStreams := genericiooptions.IOStreams{
 		In:     os.Stdin,
 		Out:    os.Stdout,
 		ErrOut: os.Stderr,

cmd/preview/cmdpreview.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"sigs.k8s.io/cli-utils/cmd/flagutils"
@@ -29,7 +29,7 @@ var (
 
 // GetRunner creates and returns the Runner which stores the cobra command.
 func GetRunner(factory cmdutil.Factory, invFactory inventory.ClientFactory,
-	loader manifestreader.ManifestLoader, ioStreams genericclioptions.IOStreams) *Runner {
+	loader manifestreader.ManifestLoader, ioStreams genericiooptions.IOStreams) *Runner {
 	r := &Runner{
 		factory:    factory,
 		invFactory: invFactory,
@@ -66,7 +66,7 @@ func GetRunner(factory cmdutil.Factory, invFactory inventory.ClientFactory,
 
 // Command creates the Runner, returning the cobra command associated with it.
 func Command(f cmdutil.Factory, invFactory inventory.ClientFactory, loader manifestreader.ManifestLoader,
-	ioStreams genericclioptions.IOStreams) *cobra.Command {
+	ioStreams genericiooptions.IOStreams) *cobra.Command {
 	return GetRunner(f, invFactory, loader, ioStreams).Command
 }
 
@@ -76,7 +76,7 @@ type Runner struct {
 	factory    cmdutil.Factory
 	invFactory inventory.ClientFactory
 	loader     manifestreader.ManifestLoader
-	ioStreams  genericclioptions.IOStreams
+	ioStreams  genericiooptions.IOStreams
 
 	serverSideOptions common.ServerSideOptions
 	output            string

cmd/status/cmdstatus.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/slice"
 	"sigs.k8s.io/cli-utils/cmd/flagutils"
@@ -260,7 +260,7 @@ func (r *Runner) runE(cmd *cobra.Command, args []string) error {
 
 	// Fetch a printer implementation based on the desired output format as
 	// specified in the output flag.
-	printer, err := printers.CreatePrinter(r.output, genericclioptions.IOStreams{
+	printer, err := printers.CreatePrinter(r.output, genericiooptions.IOStreams{
 		In:     cmd.InOrStdin(),
 		Out:    cmd.OutOrStdout(),
 		ErrOut: cmd.ErrOrStderr(),

cmd/status/printers/event/printer.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"sigs.k8s.io/cli-utils/cmd/status/printers/printer"
 	"sigs.k8s.io/cli-utils/pkg/apply/event"
 	"sigs.k8s.io/cli-utils/pkg/common"
@@ -22,12 +22,12 @@ import (
 // status information as a list of events as they happen.
 type Printer struct {
 	Formatter list.Formatter
-	IOStreams genericclioptions.IOStreams
+	IOStreams genericiooptions.IOStreams
 	Data      *printer.PrintData
 }
 
 // NewPrinter returns a new instance of the eventPrinter.
-func NewPrinter(ioStreams genericclioptions.IOStreams, printData *printer.PrintData) *Printer {
+func NewPrinter(ioStreams genericiooptions.IOStreams, printData *printer.PrintData) *Printer {
 	return &Printer{
 		Formatter: events.NewFormatter(ioStreams, common.DryRunNone),
 		IOStreams: ioStreams,

cmd/status/printers/json/printer.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"sigs.k8s.io/cli-utils/cmd/status/printers/printer"
 	"sigs.k8s.io/cli-utils/pkg/apply/event"
 	"sigs.k8s.io/cli-utils/pkg/common"
@@ -24,12 +24,12 @@ import (
 // status information as a list of events as they happen.
 type Printer struct {
 	Formatter list.Formatter
-	IOStreams genericclioptions.IOStreams
+	IOStreams genericiooptions.IOStreams
 	Data      *printer.PrintData
 }
 
 // NewPrinter returns a new instance of the eventPrinter.
-func NewPrinter(ioStreams genericclioptions.IOStreams, printData *printer.PrintData) *Printer {
+func NewPrinter(ioStreams genericiooptions.IOStreams, printData *printer.PrintData) *Printer {
 	return &Printer{
 		Formatter: jsonprinter.NewFormatter(ioStreams, common.DryRunNone),
 		IOStreams: ioStreams,

cmd/status/printers/printers.go

@@ -4,7 +4,7 @@
 package printers
 
 import (
-	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"sigs.k8s.io/cli-utils/cmd/status/printers/event"
 	"sigs.k8s.io/cli-utils/cmd/status/printers/json"
 	"sigs.k8s.io/cli-utils/cmd/status/printers/printer"
@@ -13,7 +13,7 @@ import (
 
 // CreatePrinter return an implementation of the Printer interface. The
 // actual implementation is based on the printerType requested.
-func CreatePrinter(printerType string, ioStreams genericclioptions.IOStreams, printData *printer.PrintData) (printer.Printer, error) {
+func CreatePrinter(printerType string, ioStreams genericiooptions.IOStreams, printData *printer.PrintData) (printer.Printer, error) {
 	switch printerType {
 	case "table":
 		return table.NewPrinter(ioStreams, printData), nil