kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97385 from FabianKramm/fix-http2-proxy 

kubectl proxy: override request host

Kubernetes-commit: 49e0c4456deb5a021eb2528d2d4c5c9354e90225
This commit is contained in:
Kubernetes Publisher 2021-02-25 15:36:15 -08:00
parent ddb56dde55 f32b960dd4
commit ef24597285
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Godeps/Godeps.json generated
View File

@ -924,11 +924,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "498bb3d8b5a6"
"Rev": "65a259a606b3"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "6d2f20b34738"
"Rev": "17b79e78ed4a"
},
{
"ImportPath": "k8s.io/cli-runtime",
@ -936,15 +936,15 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "12449b5492ee"
"Rev": "8f8241f9ef2d"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "5a6947c9f285"
"Rev": "a990afc81b7e"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "bf61fcdb2cb3"
"Rev": "8925bd66be66"
},
{
"ImportPath": "k8s.io/component-helpers",

18
go.mod
View File

@ -34,11 +34,11 @@ require (
github.com/stretchr/testify v1.6.1
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20210218021651-498bb3d8b5a6
k8s.io/apimachinery v0.0.0-20210219091810-6d2f20b34738
k8s.io/api v0.0.0-20210224172050-65a259a606b3
k8s.io/apimachinery v0.0.0-20210226011828-17b79e78ed4a
k8s.io/cli-runtime v0.0.0-20210217222438-5dae1b234a43
k8s.io/client-go v0.0.0-20210219052155-12449b5492ee
k8s.io/component-base v0.0.0-20210217012751-bf61fcdb2cb3
k8s.io/client-go v0.0.0-20210224052204-8f8241f9ef2d
k8s.io/component-base v0.0.0-20210220172449-8925bd66be66
k8s.io/component-helpers v0.0.0-20210217012858-e20ca0433831
k8s.io/klog/v2 v2.5.0
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
@ -49,12 +49,12 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210218021651-498bb3d8b5a6
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210219091810-6d2f20b34738
k8s.io/api => k8s.io/api v0.0.0-20210224172050-65a259a606b3
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210226011828-17b79e78ed4a
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210217222438-5dae1b234a43
k8s.io/client-go => k8s.io/client-go v0.0.0-20210219052155-12449b5492ee
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210217003918-5a6947c9f285
k8s.io/component-base => k8s.io/component-base v0.0.0-20210217012751-bf61fcdb2cb3
k8s.io/client-go => k8s.io/client-go v0.0.0-20210224052204-8f8241f9ef2d
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210222172343-a990afc81b7e
k8s.io/component-base => k8s.io/component-base v0.0.0-20210220172449-8925bd66be66
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210217012858-e20ca0433831
k8s.io/metrics => k8s.io/metrics v0.0.0-20210218054403-3c64c5d76970
)

10
go.sum
View File

@ -624,12 +624,12 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210218021651-498bb3d8b5a6/go.mod h1:60tmSUpHxGPFerNHbo/ayI2lKxvtrhbxFyXuEIWJd78=
k8s.io/apimachinery v0.0.0-20210219091810-6d2f20b34738/go.mod h1:Z7ps/g0rjlTeMstYrMOUttJfT2Gg34DEaG/f2PYLCWY=
k8s.io/api v0.0.0-20210224172050-65a259a606b3/go.mod h1:ihwJf2PuxutkCDfORTfZ9xVfXLV6+jUvYvOlpU4nbmM=
k8s.io/apimachinery v0.0.0-20210226011828-17b79e78ed4a/go.mod h1:Z7ps/g0rjlTeMstYrMOUttJfT2Gg34DEaG/f2PYLCWY=
k8s.io/cli-runtime v0.0.0-20210217222438-5dae1b234a43/go.mod h1:iMyecOoB0p2BUHXHKs6c0elbq/BVQYazlvwURVfjtkM=
k8s.io/client-go v0.0.0-20210219052155-12449b5492ee/go.mod h1:VGRl84/71eS0xitGML6HKUOweoHe0JXXz0WOkwRBqtc=
k8s.io/code-generator v0.0.0-20210217003918-5a6947c9f285/go.mod h1:O7FXIFFMbeLstjVDD1gKtnexuIo2JF8jkudWpXyjVeo=
k8s.io/component-base v0.0.0-20210217012751-bf61fcdb2cb3/go.mod h1:gazbxECw90jDRTaMRWKvkWJtQMg8JkZmQTWfUAvL5gQ=
k8s.io/client-go v0.0.0-20210224052204-8f8241f9ef2d/go.mod h1:/R9lncJDKfwGPHG0G2uAu5YNF3CsjiQNeQQYdUkL8G8=
k8s.io/code-generator v0.0.0-20210222172343-a990afc81b7e/go.mod h1:O7FXIFFMbeLstjVDD1gKtnexuIo2JF8jkudWpXyjVeo=
k8s.io/component-base v0.0.0-20210220172449-8925bd66be66/go.mod h1:qvS7BKmcjr5nJE4m/XbmHBsECcfhN5mq84NlccFWv2M=
k8s.io/component-helpers v0.0.0-20210217012858-e20ca0433831/go.mod h1:d+uhC9mFJUgZ9GoIJudMvsp9RDQuhSG6sWFqS5eH3cU=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=

1
pkg/proxy/proxy_server.go
View File

@ -211,6 +211,7 @@ func NewProxyHandler(apiProxyPrefix string, filter *FilterServer, cfg *rest.Conf
proxy := proxy.NewUpgradeAwareHandler(target, transport, false, false, responder)
proxy.UpgradeTransport = upgradeTransport
proxy.UseRequestLocation = true
proxy.UseLocationHost = true
proxyServer := http.Handler(proxy)
if filter != nil {