From 3bfe14b316de69bfe27c5c11cad4a328472edc4f Mon Sep 17 00:00:00 2001 From: Klaus Ma Date: Sat, 24 Dec 2016 15:36:45 +0800 Subject: [PATCH] Add TLS conf for Go1.7 --- pkg/util/net/http_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/util/net/http_test.go b/pkg/util/net/http_test.go index 0d76ba27c6c..ee7bc5014f0 100644 --- a/pkg/util/net/http_test.go +++ b/pkg/util/net/http_test.go @@ -23,6 +23,8 @@ import ( "net/url" "os" "reflect" + "runtime" + "strings" "testing" "k8s.io/kubernetes/pkg/util/sets" @@ -52,8 +54,6 @@ func TestCloneTLSConfig(t *testing.T) { // These fields are not copied "SessionTicketsDisabled", "SessionTicketKey", - "DynamicRecordSizingDisabled", - "Renegotiation", // These fields are unexported "serverInitOnce", @@ -61,6 +61,11 @@ func TestCloneTLSConfig(t *testing.T) { "sessionTicketKeys", ) + // See #33936. + if strings.HasPrefix(runtime.Version(), "go1.7") { + expected.Insert("DynamicRecordSizingDisabled", "Renegotiation") + } + fields := sets.NewString() structType := reflect.TypeOf(tls.Config{}) for i := 0; i < structType.NumField(); i++ {