Fix dependencies

vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go

@@ -29,7 +29,6 @@ import (
 	"os"
 	"os/exec"
 	"reflect"
-	"strings"
 	"sync"
 	"time"
 
@@ -39,7 +38,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
-	"k8s.io/apimachinery/pkg/util/clock"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/pkg/apis/clientauthentication"
 	"k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1"
@@ -48,17 +46,11 @@ import (
 	"k8s.io/client-go/tools/metrics"
 	"k8s.io/client-go/transport"
 	"k8s.io/client-go/util/connrotation"
-	"k8s.io/klog/v2"
+	"k8s.io/klog"
 )
 
 const execInfoEnv = "KUBERNETES_EXEC_INFO"
 const onRotateListWarningLength = 1000
-const installHintVerboseHelp = `
-
-It looks like you are trying to use a client-go credential plugin that is not installed.
-
-To learn more about this feature, consult the documentation available at:
-      https://kubernetes.io/docs/reference/access-authn-authz/authentication/#client-go-credential-plugins`
 
 var scheme = runtime.NewScheme()
 var codecs = serializer.NewCodecFactory(scheme)
@@ -116,44 +108,6 @@ func (c *cache) put(s string, a *Authenticator) *Authenticator {
 	return a
 }
 
-// sometimes rate limits how often a function f() is called. Specifically, Do()
-// will run the provided function f() up to threshold times every interval
-// duration.
-type sometimes struct {
-	threshold int
-	interval  time.Duration
-
-	clock clock.Clock
-	mu    sync.Mutex
-
-	count  int       // times we have called f() in this window
-	window time.Time // beginning of current window of length interval
-}
-
-func (s *sometimes) Do(f func()) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	now := s.clock.Now()
-	if s.window.IsZero() {
-		s.window = now
-	}
-
-	// If we are no longer in our saved time window, then we get to reset our run
-	// count back to 0 and start increasing towards the threshold again.
-	if inWindow := now.Sub(s.window) < s.interval; !inWindow {
-		s.window = now
-		s.count = 0
-	}
-
-	// If we have not run the function more than threshold times in this current
-	// time window, we get to run it now!
-	if underThreshold := s.count < s.threshold; underThreshold {
-		s.count++
-		f()
-	}
-}
-
 // GetAuthenticator returns an exec-based plugin for providing client credentials.
 func GetAuthenticator(config *api.ExecConfig) (*Authenticator, error) {
 	return newAuthenticator(globalCache, config)
@@ -175,13 +129,6 @@ func newAuthenticator(c *cache, config *api.ExecConfig) (*Authenticator, error)
 		args:  config.Args,
 		group: gv,
 
-		installHint: config.InstallHint,
-		sometimes: &sometimes{
-			threshold: 10,
-			interval:  time.Hour,
-			clock:     clock.RealClock{},
-		},
-
 		stdin:       os.Stdin,
 		stderr:      os.Stderr,
 		interactive: terminal.IsTerminal(int(os.Stdout.Fd())),
@@ -205,12 +152,6 @@ type Authenticator struct {
 	group schema.GroupVersion
 	env   []string
 
-	// Used to avoid log spew by rate limiting install hint printing. We didn't do
-	// this by interval based rate limiting alone since that way may have prevented
-	// the install hint from showing up for kubectl users.
-	sometimes   *sometimes
-	installHint string
-
 	// Stubbable for testing
 	stdin       io.Reader
 	stderr      io.Writer
@@ -237,15 +178,6 @@ type credentials struct {
 // UpdateTransportConfig updates the transport.Config to use credentials
 // returned by the plugin.
 func (a *Authenticator) UpdateTransportConfig(c *transport.Config) error {
-	// If a bearer token is present in the request - avoid the GetCert callback when
-	// setting up the transport, as that triggers the exec action if the server is
-	// also configured to allow client certificates for authentication. For requests
-	// like "kubectl get --token (token) pods" we should assume the intention is to
-	// use the provided token for authentication.
-	if c.HasTokenAuth() {
-		return nil
-	}
-
 	c.Wrap(func(rt http.RoundTripper) http.RoundTripper {
 		return &roundTripper{a, rt}
 	})
@@ -391,7 +323,7 @@ func (a *Authenticator) refreshCredsLocked(r *clientauthentication.Response) err
 	}
 
 	if err := cmd.Run(); err != nil {
-		return a.wrapCmdRunErrorLocked(err)
+		return fmt.Errorf("exec: %v", err)
 	}
 
 	_, gvk, err := codecs.UniversalDecoder(a.group).Decode(stdout.Bytes(), nil, cred)
@@ -462,35 +394,3 @@ func (a *Authenticator) refreshCredsLocked(r *clientauthentication.Response) err
 	expirationMetrics.set(a, expiry)
 	return nil
 }
-
-// wrapCmdRunErrorLocked pulls out the code to construct a helpful error message
-// for when the exec plugin's binary fails to Run().
-//
-// It must be called while holding the Authenticator's mutex.
-func (a *Authenticator) wrapCmdRunErrorLocked(err error) error {
-	switch err.(type) {
-	case *exec.Error: // Binary does not exist (see exec.Error).
-		builder := strings.Builder{}
-		fmt.Fprintf(&builder, "exec: executable %s not found", a.cmd)
-
-		a.sometimes.Do(func() {
-			fmt.Fprint(&builder, installHintVerboseHelp)
-			if a.installHint != "" {
-				fmt.Fprintf(&builder, "\n\n%s", a.installHint)
-			}
-		})
-
-		return errors.New(builder.String())
-
-	case *exec.ExitError: // Binary execution failed (see exec.Cmd.Run()).
-		e := err.(*exec.ExitError)
-		return fmt.Errorf(
-			"exec: executable %s failed with exit code %d",
-			a.cmd,
-			e.ProcessState.ExitCode(),
-		)
-
-	default:
-		return fmt.Errorf("exec: %v", err)
-	}
-}

vendor/k8s.io/client-go/plugin/pkg/client/auth/gcp/gcp.go

@@ -33,7 +33,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/yaml"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/util/jsonpath"
-	"k8s.io/klog/v2"
+	"k8s.io/klog"
 )
 
 func init() {