merge log-client-go-auth (kubernetes#129336)

pohly · Dec 20, 2024 · 4d1a4d8 · 4d1a4d8
2 parents a4495ed + a392191
commit 4d1a4d8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/staging/src/k8s.io/client-go/plugin/pkg/client/auth/azure/azure_stub.go b/staging/src/k8s.io/client-go/plugin/pkg/client/auth/azure/azure_stub.go
@@ -25,6 +25,7 @@ import (
 
 func init() {
 	if err := rest.RegisterAuthProviderPlugin("azure", newAzureAuthProvider); err != nil {
+		//nolint:logcheck // Should not happen.
 		klog.Fatalf("Failed to register azure auth plugin: %v", err)
 	}
 }

diff --git a/staging/src/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go b/staging/src/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go
@@ -342,6 +342,7 @@ func (r *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
 		return r.base.RoundTrip(req)
 	}
 
+	ctx := req.Context()
 	creds, err := r.a.getCreds()
 	if err != nil {
 		return nil, fmt.Errorf("getting credentials: %v", err)
@@ -356,7 +357,7 @@ func (r *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	}
 	if res.StatusCode == http.StatusUnauthorized {
 		if err := r.a.maybeRefreshCreds(creds); err != nil {
-			klog.Errorf("refreshing credentials: %v", err)
+			klog.FromContext(ctx).Error(err, "Refreshing credentials failed")
 		}
 	}
 	return res, nil

diff --git a/staging/src/k8s.io/client-go/plugin/pkg/client/auth/exec/metrics.go b/staging/src/k8s.io/client-go/plugin/pkg/client/auth/exec/metrics.go
@@ -105,6 +105,7 @@ func incrementCallsMetric(err error) {
 		metrics.ExecPluginCalls.Increment(failureExitCode, pluginNotFoundError)
 
 	default: // We don't know about this error type.
+		//nolint:logcheck // This looks like debug output which shouldn't occur in practice.
 		klog.V(2).InfoS("unexpected exec plugin return error type", "type", reflect.TypeOf(err).String(), "err", err)
 		metrics.ExecPluginCalls.Increment(failureExitCode, clientInternalError)
 	}

diff --git a/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp/gcp_stub.go b/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp/gcp_stub.go
@@ -25,6 +25,7 @@ import (
 
 func init() {
 	if err := rest.RegisterAuthProviderPlugin("gcp", newGCPAuthProvider); err != nil {
+		//nolint:logcheck // Should not happen.
 		klog.Fatalf("Failed to register gcp auth plugin: %v", err)
 	}
 }

diff --git a/staging/src/k8s.io/client-go/plugin/pkg/client/auth/oidc/oidc.go b/staging/src/k8s.io/client-go/plugin/pkg/client/auth/oidc/oidc.go
@@ -49,6 +49,7 @@ const (
 
 func init() {
 	if err := restclient.RegisterAuthProviderPlugin("oidc", newOIDCAuthProvider); err != nil {
+		//nolint:logcheck // Should not happen.
 		klog.Fatalf("Failed to register oidc auth plugin: %v", err)
 	}
 }
@@ -125,6 +126,7 @@ func newOIDCAuthProvider(clusterAddress string, cfg map[string]string, persister
 	}
 
 	if len(cfg[cfgExtraScopes]) > 0 {
+		//nolint:logcheck // Should not happen.
 		klog.V(2).Infof("%s auth provider field depricated, refresh request don't send scopes",
 			cfgExtraScopes)
 	}