Merge pull request #115580 from enj/automated-cherry-pick-of-#115315-upstream-release-1.24

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

Kubernetes-commit: 337d682a34d2dfd08d593075378610fc631d9fa9
This commit is contained in:
Kubernetes Publisher
2023-02-10 09:15:30 -08:00

View File

@@ -104,7 +104,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