Revert k8s changes

middleware/kubernetes/controller.go

@@ -55,15 +55,12 @@ func newdnsController(kubeClient *client.Client, resyncPeriod time.Duration, lse
 		},
 		&api.Endpoints{}, resyncPeriod, cache.ResourceEventHandlerFuncs{})
 
-	dns.svcLister.Indexer, dns.svcController = cache.NewIndexerInformer(
+	dns.svcLister.Store, dns.svcController = cache.NewInformer(
 		&cache.ListWatch{
 			ListFunc:  serviceListFunc(dns.client, namespace, dns.selector),
 			WatchFunc: serviceWatchFunc(dns.client, namespace, dns.selector),
 		},
-		&api.Service{},
-		resyncPeriod,
-		cache.ResourceEventHandlerFuncs{},
-		cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
+		&api.Service{}, resyncPeriod, cache.ResourceEventHandlerFuncs{})
 
 	dns.nsLister.Store, dns.nsController = cache.NewInformer(
 		&cache.ListWatch{
@@ -166,34 +163,47 @@ func (dns *dnsController) GetNamespaceList() *api.NamespaceList {
 	return &nsList
 }
 
-func (dns *dnsController) GetServiceList() []*api.Service {
-	svcs, err := dns.svcLister.List(labels.Everything())
+func (dns *dnsController) GetServiceList() *api.ServiceList {
+	svcList, err := dns.svcLister.List()
 	if err != nil {
-		return []*api.Service{}
+		return &api.ServiceList{}
 	}
-	return svcs
+
+	return &svcList
 }
 
 // GetServicesByNamespace returns a map of
 // namespacename :: [ kubernetesService ]
 func (dns *dnsController) GetServicesByNamespace() map[string][]api.Service {
 	k8sServiceList := dns.GetServiceList()
-	items := make(map[string][]api.Service, len(k8sServiceList))
-	for _, i := range k8sServiceList {
-		namespace := i.Namespace
-		items[namespace] = append(items[namespace], *i)
+	if k8sServiceList == nil {
+		return nil
 	}
+
+	items := make(map[string][]api.Service, len(k8sServiceList.Items))
+	for _, i := range k8sServiceList.Items {
+		namespace := i.Namespace
+		items[namespace] = append(items[namespace], i)
+	}
+
 	return items
 }
 
 // GetServiceInNamespace returns the Service that matches
 // servicename in the namespace
 func (dns *dnsController) GetServiceInNamespace(namespace string, servicename string) *api.Service {
-	svcObj, err := dns.svcLister.Services(namespace).Get(servicename)
+	svcKey := fmt.Sprintf("%v/%v", namespace, servicename)
+	svcObj, svcExists, err := dns.svcLister.Store.GetByKey(svcKey)
+
 	if err != nil {
 		// TODO(...): should return err here
 		return nil
 	}
 
-	return svcObj
+	if !svcExists {
+		// TODO(...): should return err here
+		return nil
+	}
+
+	return svcObj.(*api.Service)
 }

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}}
 		}