From 3be9e58ddfc6ef0e8f3df74a14e8efad5e52545f Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Thu, 22 Sep 2016 08:29:50 -0300 Subject: Revert k8s changes --- middleware/kubernetes/kubernetes.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'middleware/kubernetes/kubernetes.go') diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go index eddc58b12..7e21d5759 100644 --- a/middleware/kubernetes/kubernetes.go +++ b/middleware/kubernetes/kubernetes.go @@ -183,14 +183,14 @@ func (k *Kubernetes) Get(namespace string, nsWildcard bool, servicename string, var resultItems []api.Service - for _, item := range serviceList { + for _, item := range serviceList.Items { if symbolMatches(namespace, item.Namespace, nsWildcard) && symbolMatches(servicename, item.Name, serviceWildcard) { // If namespace has a wildcard, filter results against Corefile namespace list. // (Namespaces without a wildcard were filtered before the call to this function.) if nsWildcard && (len(k.Namespaces) > 0) && (!util.StringInSlice(item.Namespace, k.Namespaces)) { continue } - resultItems = append(resultItems, *item) + resultItems = append(resultItems, item) } } @@ -216,11 +216,11 @@ func isKubernetesNameError(err error) bool { } func (k *Kubernetes) getServiceRecordForIP(ip, name string) []msg.Service { - svcList, err := k.APIConn.svcLister.List(labels.Everything()) + svcList, err := k.APIConn.svcLister.List() if err != nil { return nil } - for _, service := range svcList { + for _, service := range svcList.Items { if service.Spec.ClusterIP == ip { return []msg.Service{msg.Service{Host: ip}} } -- cgit v1.2.3