Skip to content

K
k3s
Commit 20d239a5 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #39886 from liggitt/fix-empty-list-error

Automatic merge from submit-queue Only set empty list for list types If List() impls return non-list objects (like Status objects), we shouldn't try to set them to an empty list follow up to #39834
parents fd29a5fc fc5342a5
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/genericapiserver/api/handlers/rest.go
View file @ 20d239a5
...@@ -335,7 +335,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch ...@@ -335,7 +335,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
} }
trace.Step("Self-linking done") trace.Step("Self-linking done")
// Ensure empty lists return a non-nil items slice // Ensure empty lists return a non-nil items slice
if numberOfItems == 0 { if numberOfItems == 0 && meta.IsListType(result) {
if err := meta.SetList(result, []runtime.Object{}); err != nil { if err := meta.SetList(result, []runtime.Object{}); err != nil {
scope.err(err, res.ResponseWriter, req.Request) scope.err(err, res.ResponseWriter, req.Request)
return return
......
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