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

Merge pull request #15305 from mqliang/deamonSetList

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-29 11:25:52 -07:00
commit 1ecda94f0a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/client/cache/listers.go vendored
View File

@ -244,9 +244,9 @@ func (s *StoreToDaemonSetLister) Exists(ds *extensions.DaemonSet) (bool, error)
// List lists all daemon sets in the store.
// TODO: converge on the interface in pkg/client
func (s *StoreToDaemonSetLister) List() (dss []extensions.DaemonSet, err error) {
func (s *StoreToDaemonSetLister) List() (dss extensions.DaemonSetList, err error) {
for _, c := range s.Store.List() {
dss = append(dss, *(c.(*extensions.DaemonSet)))
dss.Items = append(dss.Items, *(c.(*extensions.DaemonSet)))
}
return dss, nil
}

6
pkg/client/cache/listers_test.go vendored
View File

@ -173,7 +173,8 @@ func TestStoreToDaemonSetLister(t *testing.T) {
{ObjectMeta: api.ObjectMeta{Name: "basic"}},
},
list: func() ([]extensions.DaemonSet, error) {
return lister.List()
list, err := lister.List()
return list.Items, err
},
outDaemonSetNames: sets.NewString("basic"),
},
@ -185,7 +186,8 @@ func TestStoreToDaemonSetLister(t *testing.T) {
{ObjectMeta: api.ObjectMeta{Name: "complex2"}},
},
list: func() ([]extensions.DaemonSet, error) {
return lister.List()
list, err := lister.List()
return list.Items, err
},
outDaemonSetNames: sets.NewString("basic", "complex", "complex2"),
},

4
pkg/controller/daemon/controller.go
View File

@ -202,8 +202,8 @@ func (dsc *DaemonSetsController) enqueueAllDaemonSets() {
glog.Errorf("Error enqueueing daemon sets: %v", err)
return
}
for i := range ds {
dsc.enqueueDaemonSet(&ds[i])
for i := range ds.Items {
dsc.enqueueDaemonSet(&ds.Items[i])
}
}