github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Prepare apiserver for operating on cached objects by not modifying them

Browse Source
This commit is contained in:
Wojciech Tyczyński 2022-02-21 15:05:35 +01:00
parent 170a9c050f
commit 7e434682e4
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apimachinery/pkg/watch/watch.go
View File

@ -27,11 +27,11 @@ import (
// Interface can be implemented by anything that knows how to watch and report changes. // Interface can be implemented by anything that knows how to watch and report changes.
type Interface interface { type Interface interface {
// Stops watching. Will close the channel returned by ResultChan(). Releases // Stop stops watching. Will close the channel returned by ResultChan(). Releases
// any resources used by the watch. // any resources used by the watch.
Stop() Stop()
// Returns a chan which will receive all the events. If an error occurs // ResultChan returns a chan which will receive all the events. If an error occurs
// or Stop() is called, the implementation will close this channel and // or Stop() is called, the implementation will close this channel and
// release any resources used by the watch. // release any resources used by the watch.
ResultChan() <-chan Event ResultChan() <-chan Event

10
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/response.go
View File

@ -59,8 +59,14 @@ func doTransformObject(ctx context.Context, obj runtime.Object, opts interface{}
if _, ok := obj.(*metav1.Status); ok { if _, ok := obj.(*metav1.Status); ok {
return obj, nil return obj, nil
} }
if err := ensureNonNilItems(obj); err != nil {
return nil, err // ensure that for empty lists we don't return <nil> items.
// This is safe to modify without deep-copying the object, as
// List objects themselves are never cached.
if meta.IsListType(obj) && meta.LenList(obj) == 0 {
if err := meta.SetList(obj, []runtime.Object{}); err != nil {
return nil, err
}
} }
switch target := mediaType.Convert; { switch target := mediaType.Convert; {

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

@ -356,16 +356,6 @@ func dedupOwnerReferencesAndAddWarning(obj runtime.Object, requestContext contex
} }
} }
// ensureNonNilItems ensures that for empty lists we don't return <nil> items.
func ensureNonNilItems(obj runtime.Object) error {
if meta.IsListType(obj) && meta.LenList(obj) == 0 {
if err := meta.SetList(obj, []runtime.Object{}); err != nil {
return err
}
}
return nil
}
func summarizeData(data []byte, maxLength int) string { func summarizeData(data []byte, maxLength int) string {
switch { switch {
case len(data) == 0: case len(data) == 0: