diff --git a/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/server_test.go b/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/server_test.go index 0503c2c10b1..4a1a9761040 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/server_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/server_test.go @@ -79,7 +79,7 @@ func TestServingCert(t *testing.T) { } dynamicCertificateController := NewDynamicServingCertificateController( - *tlsConfig, + tlsConfig, &nullCAContent{name: "client-ca"}, defaultCertProvider, sniCerts, diff --git a/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/tlsconfig.go b/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/tlsconfig.go index 23a9b2e429e..a4bbd1e8fa7 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/tlsconfig.go +++ b/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/tlsconfig.go @@ -41,7 +41,7 @@ const workItemKey = "key" type DynamicServingCertificateController struct { // baseTLSConfig is the static portion of the tlsConfig for serving to clients. It is copied and the copy is mutated // based on the dynamic cert state. - baseTLSConfig tls.Config + baseTLSConfig *tls.Config // clientCA provides the very latest content of the ca bundle clientCA CAContentProvider @@ -65,7 +65,7 @@ var _ Listener = &DynamicServingCertificateController{} // NewDynamicServingCertificateController returns a controller that can be used to keep a TLSConfig up to date. func NewDynamicServingCertificateController( - baseTLSConfig tls.Config, + baseTLSConfig *tls.Config, clientCA CAContentProvider, servingCert CertKeyContentProvider, sniCerts []SNICertKeyContentProvider, diff --git a/staging/src/k8s.io/apiserver/pkg/server/secure_serving.go b/staging/src/k8s.io/apiserver/pkg/server/secure_serving.go index 6d165abdf55..92149f124cc 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/secure_serving.go +++ b/staging/src/k8s.io/apiserver/pkg/server/secure_serving.go @@ -66,7 +66,7 @@ func (s *SecureServingInfo) tlsConfig(stopCh <-chan struct{}) (*tls.Config, erro if s.ClientCA != nil || s.Cert != nil || len(s.SNICerts) > 0 { dynamicCertificateController := dynamiccertificates.NewDynamicServingCertificateController( - *tlsConfig, + tlsConfig, s.ClientCA, s.Cert, s.SNICerts,