unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Fix breaking build

Browse Source
This commit is contained in:
Asim
2015-10-20 18:03:39 +01:00
parent 975c6d4148
commit e2b849da29
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
registry/kubernetes/kubernetes.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/myodc/go-micro/registry" "github.com/myodc/go-micro/registry"
k8s "k8s.io/kubernetes/pkg/client/unversioned" k8s "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
) )
@@ -38,7 +39,7 @@ func (c *kregistry) GetService(name string) (*registry.Service, error) {
selector := labels.SelectorFromSet(labels.Set{"name": name}) selector := labels.SelectorFromSet(labels.Set{"name": name})
services, err := c.client.Services(c.namespace).List(selector) services, err := c.client.Services(c.namespace).List(selector, fields.Everything())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -75,7 +76,7 @@ func (c *kregistry) ListServices() ([]*registry.Service, error) {
return services, nil return services, nil
} }
rsp, err := c.client.Services(c.namespace).List(labels.Everything()) rsp, err := c.client.Services(c.namespace).List(labels.Everything(), fields.Everything())
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
registry/kubernetes/watcher.go
View File

@@ -66,7 +66,7 @@ func (k *watcher) Stop() {
func newWatcher(kr *kregistry) (registry.Watcher, error) { func newWatcher(kr *kregistry) (registry.Watcher, error) {
svi := kr.client.Services(api.NamespaceAll) svi := kr.client.Services(api.NamespaceAll)
services, err := svi.List(labels.Everything()) services, err := svi.List(labels.Everything(), fields.Everything())
if err != nil { if err != nil {
return nil, err return nil, err
} }