Merge pull request #66516 from tallclair/redirect

Add verification to apiserver redirect following

Kubernetes-commit: 109b67c291de3b9bda35c35e471b9064de6ff859
This commit is contained in:
Kubernetes Publisher 2018-09-26 15:53:09 -07:00
commit 44e7f0ea19
2 changed files with 52 additions and 52 deletions

102
Godeps/Godeps.json generated
View File

@ -400,207 +400,207 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/cache", "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/clock", "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/naming", "ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "5ae511e0ed34ac0fbf6e17340df5605372591d00" "Rev": "a191abe0b71e00ce4cde58af8002aa4c1a8bb068"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto", "ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@ -38,7 +38,7 @@ func RoundTripperFor(config *restclient.Config) (http.RoundTripper, Upgrader, er
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
upgradeRoundTripper := spdy.NewRoundTripper(tlsConfig, true) upgradeRoundTripper := spdy.NewRoundTripper(tlsConfig, true, false)
wrapper, err := restclient.HTTPWrappersForConfig(config, upgradeRoundTripper) wrapper, err := restclient.HTTPWrappersForConfig(config, upgradeRoundTripper)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err