github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #43802 from deads2k/api-07-listfor

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 44119, 42538, 43802, 42336, 43396)

remove ListMetaFor

Finish replacing `ListMetaFor` with `ListAccessor`.  This gives more flexibility for list handling as intended.  `UnstructuredList` matches now.

@kubernetes/sig-api-machinery-pr-reviews
This commit is contained in:
Kubernetes Submit Queue 2017-04-07 14:09:38 -07:00 committed by GitHub
commit 51301d83d1
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/meta.go
View File

@ -36,20 +36,6 @@ func ObjectMetaFor(obj runtime.Object) (*ObjectMeta, error) {
return meta, err return meta, err
} }
// ListMetaFor returns a pointer to a provided object's ListMeta,
// or an error if the object does not have that pointer.
// TODO: allow runtime.Unknown to extract this object
// TODO: Remove this function and use meta.ObjectMetaAccessor() instead.
func ListMetaFor(obj runtime.Object) (*ListMeta, error) {
v, err := conversion.EnforcePtr(obj)
if err != nil {
return nil, err
}
var meta *ListMeta
err = runtime.FieldPtr(v, "ListMeta", &meta)
return meta, err
}
// TODO: move this, Object, List, and Type to a different package // TODO: move this, Object, List, and Type to a different package
type ObjectMetaAccessor interface { type ObjectMetaAccessor interface {
GetObjectMeta() Object GetObjectMeta() Object

7
staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go
View File

@ -20,7 +20,6 @@ import (
"strconv" "strconv"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage"
) )
@ -45,15 +44,15 @@ func (a APIObjectVersioner) UpdateObject(obj runtime.Object, resourceVersion uin
// UpdateList implements Versioner // UpdateList implements Versioner
func (a APIObjectVersioner) UpdateList(obj runtime.Object, resourceVersion uint64) error { func (a APIObjectVersioner) UpdateList(obj runtime.Object, resourceVersion uint64) error {
listMeta, err := metav1.ListMetaFor(obj) listAccessor, err := meta.ListAccessor(obj)
if err != nil || listMeta == nil { if err != nil || listAccessor == nil {
return err return err
} }
versionString := "" versionString := ""
if resourceVersion != 0 { if resourceVersion != 0 {
versionString = strconv.FormatUint(resourceVersion, 10) versionString = strconv.FormatUint(resourceVersion, 10)
} }
listMeta.ResourceVersion = versionString listAccessor.SetResourceVersion(versionString)
return nil return nil
} }

12
staging/src/k8s.io/client-go/tools/cache/testing/fake_controller_source.go vendored
View File

@ -174,12 +174,12 @@ func (f *FakeControllerSource) List(options metav1.ListOptions) (runtime.Object,
if err := meta.SetList(listObj, list); err != nil { if err := meta.SetList(listObj, list); err != nil {
return nil, err return nil, err
} }
objMeta, err := metav1.ListMetaFor(listObj) listAccessor, err := meta.ListAccessor(listObj)
if err != nil { if err != nil {
return nil, err return nil, err
} }
resourceVersion := len(f.changes) resourceVersion := len(f.changes)
objMeta.ResourceVersion = strconv.Itoa(resourceVersion) listAccessor.SetResourceVersion(strconv.Itoa(resourceVersion))
return listObj, nil return listObj, nil
} }
@ -195,12 +195,12 @@ func (f *FakePVControllerSource) List(options metav1.ListOptions) (runtime.Objec
if err := meta.SetList(listObj, list); err != nil { if err := meta.SetList(listObj, list); err != nil {
return nil, err return nil, err
} }
objMeta, err := metav1.ListMetaFor(listObj) listAccessor, err := meta.ListAccessor(listObj)
if err != nil { if err != nil {
return nil, err return nil, err
} }
resourceVersion := len(f.changes) resourceVersion := len(f.changes)
objMeta.ResourceVersion = strconv.Itoa(resourceVersion) listAccessor.SetResourceVersion(strconv.Itoa(resourceVersion))
return listObj, nil return listObj, nil
} }
@ -216,12 +216,12 @@ func (f *FakePVCControllerSource) List(options metav1.ListOptions) (runtime.Obje
if err := meta.SetList(listObj, list); err != nil { if err := meta.SetList(listObj, list); err != nil {
return nil, err return nil, err
} }
objMeta, err := metav1.ListMetaFor(listObj) listAccessor, err := meta.ListAccessor(listObj)
if err != nil { if err != nil {
return nil, err return nil, err
} }
resourceVersion := len(f.changes) resourceVersion := len(f.changes)
objMeta.ResourceVersion = strconv.Itoa(resourceVersion) listAccessor.SetResourceVersion(strconv.Itoa(resourceVersion))
return listObj, nil return listObj, nil
} }