github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return MethodNotSupported when accessing unwatcheable resource with ?watch=true

Browse Source
This commit is contained in:
Jordan Liggitt
2017-05-19 15:42:22 -04:00
parent effca9605b
commit da8ae29620
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go
View File

@@ -292,7 +292,11 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
opts.FieldSelector = nameSelector opts.FieldSelector = nameSelector
} }
if (opts.Watch || forceWatch) && rw != nil { if opts.Watch || forceWatch {
if rw == nil {
scope.err(errors.NewMethodNotSupported(scope.Resource.GroupResource(), "watch"), w, req)
return
}
// TODO: Currently we explicitly ignore ?timeout= and use only ?timeoutSeconds=. // TODO: Currently we explicitly ignore ?timeout= and use only ?timeoutSeconds=.
timeout := time.Duration(0) timeout := time.Duration(0)
if opts.TimeoutSeconds != nil { if opts.TimeoutSeconds != nil {