Created
December 14, 2017 01:14
-
-
Save ericchiang/7f5804403b359ebdf79dcf76c4071bff to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/staging/src/k8s.io/client-go/rest/transport.go b/staging/src/k8s.io/client-go/rest/transport.go | |
index f59f8dbe27..9039ab9650 100644 | |
--- a/staging/src/k8s.io/client-go/rest/transport.go | |
+++ b/staging/src/k8s.io/client-go/rest/transport.go | |
@@ -58,22 +58,7 @@ func HTTPWrappersForConfig(config *Config, rt http.RoundTripper) (http.RoundTrip | |
// TransportConfig converts a client config to an appropriate transport config. | |
func (c *Config) TransportConfig() (*transport.Config, error) { | |
- wt := c.WrapTransport | |
- if c.AuthProvider != nil { | |
- provider, err := GetAuthProvider(c.Host, c.AuthProvider, c.AuthConfigPersister) | |
- if err != nil { | |
- return nil, err | |
- } | |
- if wt != nil { | |
- previousWT := wt | |
- wt = func(rt http.RoundTripper) http.RoundTripper { | |
- return provider.WrapTransport(previousWT(rt)) | |
- } | |
- } else { | |
- wt = provider.WrapTransport | |
- } | |
- } | |
- return &transport.Config{ | |
+ c := &transport.Config{ | |
UserAgent: c.UserAgent, | |
Transport: c.Transport, | |
WrapTransport: wt, | |
@@ -98,4 +83,8 @@ func (c *Config) TransportConfig() (*transport.Config, error) { | |
}, | |
Dial: c.Dial, | |
}, nil | |
+ if c.AuthProvider != nil { | |
+ c.AuthProvider.UpdateTransportConfig(c) | |
+ } | |
+ return c, nil | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment