aboutsummaryrefslogtreecommitdiff
path: root/middleware/kubernetes/kubernetes.go
diff options
context:
space:
mode:
authorGravatar Manuel de Brito Fontes <aledbf@gmail.com> 2016-09-23 10:13:02 -0300
committerGravatar Manuel de Brito Fontes <aledbf@gmail.com> 2016-09-23 10:23:11 -0300
commit8e6257c51f45c96f825a08ed28fae711a4082cc4 (patch)
treebc23ad7d745dfff69d4ba87f9c19be2ce9fd2b0f /middleware/kubernetes/kubernetes.go
parent6e0944eb98b8052d9c2188df3218fb9f6dfc2731 (diff)
downloadcoredns-8e6257c51f45c96f825a08ed28fae711a4082cc4.tar.gz
coredns-8e6257c51f45c96f825a08ed28fae711a4082cc4.tar.zst
coredns-8e6257c51f45c96f825a08ed28fae711a4082cc4.zip
Lister refactor kubernetes/kubernetes#33269
Diffstat (limited to 'middleware/kubernetes/kubernetes.go')
-rw-r--r--middleware/kubernetes/kubernetes.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go
index d31562a25..ae57c6e98 100644
--- a/middleware/kubernetes/kubernetes.go
+++ b/middleware/kubernetes/kubernetes.go
@@ -159,7 +159,7 @@ func (k *Kubernetes) Records(name string, exact bool) ([]msg.Service, error) {
}
// TODO: assemble name from parts found in k8s data based on name template rather than reusing query string
-func (k *Kubernetes) getRecordsForServiceItems(serviceItems []api.Service, values nametemplate.NameValues) []msg.Service {
+func (k *Kubernetes) getRecordsForServiceItems(serviceItems []*api.Service, values nametemplate.NameValues) []msg.Service {
var records []msg.Service
for _, item := range serviceItems {
@@ -182,12 +182,12 @@ func (k *Kubernetes) getRecordsForServiceItems(serviceItems []api.Service, value
}
// Get performs the call to the Kubernetes http API.
-func (k *Kubernetes) Get(namespace string, nsWildcard bool, servicename string, serviceWildcard bool) ([]api.Service, error) {
+func (k *Kubernetes) Get(namespace string, nsWildcard bool, servicename string, serviceWildcard bool) ([]*api.Service, error) {
serviceList := k.APIConn.GetServiceList()
- var resultItems []api.Service
+ var resultItems []*api.Service
- for _, item := range serviceList.Items {
+ for _, item := range serviceList {
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.)
@@ -220,11 +220,11 @@ func isKubernetesNameError(err error) bool {
}
func (k *Kubernetes) getServiceRecordForIP(ip, name string) []msg.Service {
- svcList, err := k.APIConn.svcLister.List()
+ svcList, err := k.APIConn.svcLister.List(labels.Everything())
if err != nil {
return nil
}
- for _, service := range svcList.Items {
+ for _, service := range svcList {
if service.Spec.ClusterIP == ip {
return []msg.Service{msg.Service{Host: ip}}
}