Skip to content

Commit

Permalink
Merge pull request #115566 from enj/automated-cherry-pick-of-#115315-…
Browse files Browse the repository at this point in the history
…upstream-release-1.26

Automated cherry pick of #115315: kubelet/client: collapse transport wiring onto standard

Kubernetes-commit: 1802182ca3f88c0d0db79e46757e9158c9b187dc
  • Loading branch information
k8s-publishing-bot committed Feb 10, 2023
2 parents 9112e19 + 0519b53 commit e6bc0bc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion transport/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (c *tlsTransportCache) get(config *Config) (http.RoundTripper, error) {

// If we use are reloading files, we need to handle certificate rotation properly
// TODO(jackkleeman): We can also add rotation here when config.HasCertCallback() is true
if config.TLS.ReloadTLSFiles {
if config.TLS.ReloadTLSFiles && tlsConfig != nil && tlsConfig.GetClientCertificate != nil {
dynamicCertDialer := certRotatingDialer(tlsConfig.GetClientCertificate, dial)
tlsConfig.GetClientCertificate = dynamicCertDialer.GetClientCertificate
dial = dynamicCertDialer.connDialer.DialContext
Expand Down

0 comments on commit e6bc0bc

Please sign in to comment.