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

Move list functions from runtime to meta package

Browse Source
This commit is contained in:
feihujiang
2015-11-12 18:45:42 +08:00
parent b12550273e
commit ad79fa6e84
17 changed files with 387 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/controller/framework/fake_controller_source.go
View File

@@ -23,6 +23,7 @@ import (
"sync"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/watch"
@@ -136,7 +137,7 @@ func (f *FakeControllerSource) List() (runtime.Object, error) {
list = append(list, objCopy.(runtime.Object))
}
listObj := &api.List{}
if err := runtime.SetList(listObj, list); err != nil {
if err := meta.SetList(listObj, list); err != nil {
return nil, err
}
objMeta, err := api.ListMetaFor(listObj)