Skip to content

K
k3s
Commit 6e0ad75a authored by Clayton Coleman's avatar Clayton Coleman
Browse files
Options

Change the signature of resthandler.err for upcoming watch changes

Watch will need to be able to invoke scope.err, and it will not have access to the go-restful req/res. Change to use the raw http type now.
parent a9a65e70
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/apiserver/watch.go
View file @ 6e0ad75a
...@@ -68,7 +68,7 @@ func (w *realTimeoutFactory) TimeoutCh() (<-chan time.Time, func() bool) { ...@@ -68,7 +68,7 @@ func (w *realTimeoutFactory) TimeoutCh() (<-chan time.Time, func() bool) {
func serveWatch(watcher watch.Interface, scope RequestScope, req *restful.Request, res *restful.Response, timeout time.Duration) { func serveWatch(watcher watch.Interface, scope RequestScope, req *restful.Request, res *restful.Response, timeout time.Duration) {
s, mediaType, err := negotiateOutputSerializer(req.Request, scope.Serializer) s, mediaType, err := negotiateOutputSerializer(req.Request, scope.Serializer)
if err != nil { if err != nil {
scope.err(err, req, res) scope.err(err, res.ResponseWriter, req.Request)
return return
} }
// TODO: replace with typed serialization // TODO: replace with typed serialization
......
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