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

Merge pull request #37487 from wojtek-t/kubernetes_service

Browse Source 
Automatic merge from submit-queue

Fix TestServiceAlloc flakes

Fix #37040
This commit is contained in:
Kubernetes Submit Queue 2016-11-29 17:04:04 -08:00 committed by GitHub
commit 985079a82f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/registry/core/service/ipallocator/controller/repair.go
View File

@ -105,7 +105,7 @@ func (c *Repair) runOnce() error {
// the service collection. The caching layer keeps per-collection RVs,
// and this is proper, since in theory the collections could be hosted
// in separate etcd (or even non-etcd) instances.
list, err := c.registry.ListServices(ctx, nil)
list, err := c.registry.ListServices(ctx, &api.ListOptions{})
if err != nil {
return fmt.Errorf("unable to refresh the service IP block: %v", err)
}

2
pkg/registry/core/service/portallocator/controller/repair.go
View File

@ -94,7 +94,7 @@ func (c *Repair) runOnce() error {
// the service collection. The caching layer keeps per-collection RVs,
// and this is proper, since in theory the collections could be hosted
// in separate etcd (or even non-etcd) instances.
list, err := c.registry.ListServices(ctx, nil)
list, err := c.registry.ListServices(ctx, &api.ListOptions{})
if err != nil {
return fmt.Errorf("unable to refresh the port block: %v", err)
}

3
pkg/registry/generic/registry/store.go
View File

@ -203,7 +203,8 @@ func (e *Store) List(ctx api.Context, options *api.ListOptions) (runtime.Object,
// ListPredicate returns a list of all the items matching m.
func (e *Store) ListPredicate(ctx api.Context, p storage.SelectionPredicate, options *api.ListOptions) (runtime.Object, error) {
if options == nil {
options = &api.ListOptions{ResourceVersion: "0"}
// By default we should serve the request from etcd.
options = &api.ListOptions{ResourceVersion: ""}
}
list := e.NewListFunc()
if name, ok := p.MatchesSingle(); ok {