Skip to content

K
k3s
Commit 745928aa authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #39213 from k82cn/k8s_33936_master

Automatic merge from submit-queue (batch tested with PRs 38909, 39213) Add TLS conf for Go1.7 fixes #33936 / #38596 in master
parents 17564eda 3bfe14b3
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
pkg/util/net/http_test.go
View file @ 745928aa
...@@ -23,6 +23,8 @@ import ( ...@@ -23,6 +23,8 @@ import (
"net/url" "net/url"
"os" "os"
"reflect" "reflect"
"runtime"
"strings"
"testing" "testing"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
...@@ -52,8 +54,6 @@ func TestCloneTLSConfig(t *testing.T) { ...@@ -52,8 +54,6 @@ func TestCloneTLSConfig(t *testing.T) {
// These fields are not copied // These fields are not copied
"SessionTicketsDisabled", "SessionTicketsDisabled",
"SessionTicketKey", "SessionTicketKey",
"DynamicRecordSizingDisabled",
"Renegotiation",
// These fields are unexported // These fields are unexported
"serverInitOnce", "serverInitOnce",
...@@ -61,6 +61,11 @@ func TestCloneTLSConfig(t *testing.T) { ...@@ -61,6 +61,11 @@ func TestCloneTLSConfig(t *testing.T) {
"sessionTicketKeys", "sessionTicketKeys",
) )
// See #33936.
if strings.HasPrefix(runtime.Version(), "go1.7") {
expected.Insert("DynamicRecordSizingDisabled", "Renegotiation")
}
fields := sets.NewString() fields := sets.NewString()
structType := reflect.TypeOf(tls.Config{}) structType := reflect.TypeOf(tls.Config{})
for i := 0; i < structType.NumField(); i++ { for i := 0; i < structType.NumField(); i++ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment