diff --git a/prog/kube-peers/main.go b/prog/kube-peers/main.go
index a0b9cd85..75d7a670 100644
--- a/prog/kube-peers/main.go
+++ b/prog/kube-peers/main.go
@@ -10,16 +10,8 @@ import (
 	"k8s.io/client-go/rest"
 )
 
-func getKubePeers() ([]string, error) {
-	config, err := rest.InClusterConfig()
-	if err != nil {
-		return nil, err
-	}
-	c, err := kubernetes.NewForConfig(config)
-	if err != nil {
-		return nil, err
-	}
-	nodeList, err := c.Core().Nodes().List(api.ListOptions{})
+func getKubePeers(c *kubernetes.Clientset) ([]string, error) {
+	nodeList, err := c.Nodes().List(api.ListOptions{})
 	if err != nil {
 		return nil, err
 	}
@@ -50,7 +42,15 @@ func getKubePeers() ([]string, error) {
 }
 
 func main() {
-	peers, err := getKubePeers()
+	config, err := rest.InClusterConfig()
+	if err != nil {
+		log.Fatalf("Could not get cluster config: %v", err)
+	}
+	c, err := kubernetes.NewForConfig(config)
+	if err != nil {
+		log.Fatalf("Could not make Kubernetes connection: %v", err)
+	}
+	peers, err := getKubePeers(c)
 	if err != nil {
 		log.Fatalf("Could not get peers: %v", err)
 	}