github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-23 02:47:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #104920 from tkashem/response-writer-cleanup

Browse Source 
apiserver: decorate http.ResponseWriter correctly
This commit is contained in:
Kubernetes Prow Robot
2021-10-05 00:53:09 -07:00
committed by GitHub
parent 0a29e2a73a 0d50c969c5
commit efa9029a0d
16 changed files with 722 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/cri/streaming/portforward/websocket.go
View File

@@ -31,7 +31,7 @@ import (
api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/server/httplog"
"k8s.io/apiserver/pkg/endpoints/responsewriter"
"k8s.io/apiserver/pkg/util/wsstream"
)
@@ -113,7 +113,7 @@ func handleWebSocketStreams(req *http.Request, w http.ResponseWriter, portForwar
},
})
conn.SetIdleTimeout(idleTimeout)
_, streams, err := conn.Open(httplog.Unlogged(req, w), req)
_, streams, err := conn.Open(responsewriter.GetOriginal(w), req)
if err != nil {
err = fmt.Errorf("unable to upgrade websocket connection: %v", err)
return err

4
pkg/kubelet/cri/streaming/remotecommand/websocket.go
View File

@@ -22,7 +22,7 @@ import (
"time"
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/server/httplog"
"k8s.io/apiserver/pkg/endpoints/responsewriter"
"k8s.io/apiserver/pkg/util/wsstream"
)
@@ -95,7 +95,7 @@ func createWebSocketStreams(req *http.Request, w http.ResponseWriter, opts *Opti
},
})
conn.SetIdleTimeout(idleTimeout)
negotiatedProtocol, streams, err := conn.Open(httplog.Unlogged(req, w), req)
negotiatedProtocol, streams, err := conn.Open(responsewriter.GetOriginal(w), req)
if err != nil {
runtime.HandleError(fmt.Errorf("unable to upgrade websocket connection: %v", err))
return nil, false