From 4ce7bcced4cc68a833759a218f9c3be7f72fd1c0 Mon Sep 17 00:00:00 2001 From: David Eads Date: Fri, 19 Jan 2018 11:55:55 -0500 Subject: [PATCH] generated --- .../apis/kubeletconfig/v1alpha1/zz_generated.conversion.go | 2 ++ staging/src/k8s.io/apiserver/pkg/server/options/serving.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/apis/kubeletconfig/v1alpha1/zz_generated.conversion.go b/pkg/kubelet/apis/kubeletconfig/v1alpha1/zz_generated.conversion.go index 1c800e9848b..9ca7162f5eb 100644 --- a/pkg/kubelet/apis/kubeletconfig/v1alpha1/zz_generated.conversion.go +++ b/pkg/kubelet/apis/kubeletconfig/v1alpha1/zz_generated.conversion.go @@ -159,6 +159,7 @@ func autoConvert_v1alpha1_KubeletConfiguration_To_kubeletconfig_KubeletConfigura out.TLSCertFile = in.TLSCertFile out.TLSPrivateKeyFile = in.TLSPrivateKeyFile out.TLSCipherSuites = *(*[]string)(unsafe.Pointer(&in.TLSCipherSuites)) + out.TLSMinVersion = in.TLSMinVersion if err := Convert_v1alpha1_KubeletAuthentication_To_kubeletconfig_KubeletAuthentication(&in.Authentication, &out.Authentication, s); err != nil { return err } @@ -281,6 +282,7 @@ func autoConvert_kubeletconfig_KubeletConfiguration_To_v1alpha1_KubeletConfigura out.TLSCertFile = in.TLSCertFile out.TLSPrivateKeyFile = in.TLSPrivateKeyFile out.TLSCipherSuites = *(*[]string)(unsafe.Pointer(&in.TLSCipherSuites)) + out.TLSMinVersion = in.TLSMinVersion if err := Convert_kubeletconfig_KubeletAuthentication_To_v1alpha1_KubeletAuthentication(&in.Authentication, &out.Authentication, s); err != nil { return err } diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/serving.go b/staging/src/k8s.io/apiserver/pkg/server/options/serving.go index 465839597f6..ec38ca6b675 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/serving.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/serving.go @@ -256,6 +256,7 @@ func (s *SecureServingOptions) applyServingInfoTo(c *server.Config) error { secureServingInfo.CipherSuites = cipherSuites } + var err error secureServingInfo.MinTLSVersion, err = utilflag.TLSVersion(s.MinTLSVersion) if err != nil { return err @@ -273,7 +274,6 @@ func (s *SecureServingOptions) applyServingInfoTo(c *server.Config) error { return fmt.Errorf("failed to load SNI cert and key: %v", err) } } - var err error secureServingInfo.SNICerts, err = server.GetNamedCertificateMap(namedTLSCerts) if err != nil { return err