Merge pull request #108531 from tallclair/redirects

Don't follow redirects with spdy

Kubernetes-commit: ea006f5246dded2db606dac7c642041cfbe1ccb1
This commit is contained in:
Kubernetes Publisher 2022-03-25 15:34:23 -07:00
commit ed2838156a
3 changed files with 7 additions and 9 deletions

4
go.mod
View File

@ -31,7 +31,7 @@ require (
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
google.golang.org/protobuf v1.27.1
k8s.io/api v0.0.0-20220324210930-df53a95c65aa
k8s.io/apimachinery v0.0.0-20220324210734-b68ae5efb0e8
k8s.io/apimachinery v0.0.0-20220326010739-df7fbf8e030b
k8s.io/klog/v2 v2.60.1
k8s.io/kube-openapi v0.0.0-20220323210520-29d726468e05
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
@ -41,5 +41,5 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20220324210930-df53a95c65aa
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220324210734-b68ae5efb0e8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220326010739-df7fbf8e030b
)

4
go.sum
View File

@ -615,8 +615,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220324210930-df53a95c65aa h1:NzCktMsy22Y/ddoBN/kf96kFaklITIHNfA1sRv6UofA=
k8s.io/api v0.0.0-20220324210930-df53a95c65aa/go.mod h1:Ea6ReZGsqdWOZc66t7sHO58lTcUGyQcMJ3UfsqOnKfM=
k8s.io/apimachinery v0.0.0-20220324210734-b68ae5efb0e8 h1:LULUz36bFy2WqAjJVZAbn4yVJ92Xn7oBaUCF6BR8HDk=
k8s.io/apimachinery v0.0.0-20220324210734-b68ae5efb0e8/go.mod h1:V4ECjDypP1xQpnL3N9yFzlbGZgd8tLKouJnRyAn/Zyw=
k8s.io/apimachinery v0.0.0-20220326010739-df7fbf8e030b h1:KdYn+MuhEqOjmABS52f4cQuWkxJ8DDkAgw6BkHfjD+0=
k8s.io/apimachinery v0.0.0-20220326010739-df7fbf8e030b/go.mod h1:V4ECjDypP1xQpnL3N9yFzlbGZgd8tLKouJnRyAn/Zyw=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=

View File

@ -44,11 +44,9 @@ func RoundTripperFor(config *restclient.Config) (http.RoundTripper, Upgrader, er
proxy = config.Proxy
}
upgradeRoundTripper := spdy.NewRoundTripperWithConfig(spdy.RoundTripperConfig{
TLS: tlsConfig,
FollowRedirects: true,
RequireSameHostRedirects: false,
Proxier: proxy,
PingPeriod: time.Second * 5,
TLS: tlsConfig,
Proxier: proxy,
PingPeriod: time.Second * 5,
})
wrapper, err := restclient.HTTPWrappersForConfig(config, upgradeRoundTripper)
if err != nil {