Merge pull request #29 from bacongobbler/client-go

ref(glide): use client-go

Author: Matthew Fisher

.travis.yml

@@ -1,12 +1,9 @@
 language: go
 sudo: required
 go:
-  - 1.5
-  - 1.6
-env:
-  - GO15VENDOREXPERIMENT=1
+  - 1.8
 install:
-  - wget https://github.com/Masterminds/glide/releases/download/0.8.3/glide-0.8.3-linux-amd64.tar.gz -O - | tar -xz
+  - wget https://github.com/Masterminds/glide/releases/download/v0.12.3/glide-v0.12.3-linux-amd64.tar.gz -O - | tar -xz
   - sudo mv linux-amd64/glide /usr/local/bin/ && rm -rf linux-amd64
   - glide up
 script:

aboutme/aboutme.go

@@ -17,11 +17,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/deis/pkg/k8s"
-
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/client/unversioned"
-	"k8s.io/kubernetes/pkg/labels"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
+	v1 "k8s.io/client-go/pkg/api/v1"
 )
 
 // DefaultNamespace is the Kubernetes default namespace.
@@ -44,7 +44,7 @@ type Me struct {
 	Labels                               map[string]string
 	Annotations                          map[string]string
 
-	c *unversioned.Client
+	c *kubernetes.Clientset
 }
 
 // FromEnv uses the environment to create a new Me.
@@ -69,11 +69,15 @@ func FromEnv() (*Me, error) {
 		Namespace: NamespaceFromEnv(),
 	}
 
-	client, err := k8s.PodClient()
+	config, err := rest.InClusterConfig()
+	if err != nil {
+		return me, err
+	}
+	clientset, err := kubernetes.NewForConfig(config)
 	if err != nil {
 		return me, err
 	}
-	me.c = client
+	me.c = clientset
 
 	if err := me.init(); err != nil {
 		return me, err
@@ -83,7 +87,7 @@ func FromEnv() (*Me, error) {
 }
 
 // Client returns an initialized Kubernetes API client.
-func (me *Me) Client() *unversioned.Client {
+func (me *Me) Client() *kubernetes.Clientset {
 	return me.c
 }
 
@@ -168,9 +172,9 @@ func (me *Me) init() error {
 }
 
 // loadPod loads a pod using the downward API.
-func (me *Me) loadPod() (*api.Pod, string, error) {
+func (me *Me) loadPod() (*v1.Pod, string, error) {
 	ns := NamespaceFromEnv()
-	p, err := me.c.Pods(ns).Get(me.Name)
+	p, err := me.c.CoreV1().Pods(ns).Get(me.Name, metav1.GetOptions{})
 	return p, ns, err
 }
 
@@ -180,16 +184,16 @@ func (me *Me) loadPod() (*api.Pod, string, error) {
 // string, and an error if something goes wrong.
 //
 // The selector must be a label selector.
-func (me *Me) findPodInNamespaces(selector string) (*api.Pod, string, error) {
+func (me *Me) findPodInNamespaces(selector string) (*v1.Pod, string, error) {
 	// Get the deis namespace. If it does not exist, get the default namespce.
 	s, err := labels.Parse(selector)
 	if err == nil {
-		ns, err := me.c.Namespaces().List(api.ListOptions{LabelSelector: s})
+		ns, err := me.c.CoreV1().Namespaces().List(metav1.ListOptions{LabelSelector: s.String()})
 		if err != nil {
 			return nil, "default", err
 		}
 		for _, n := range ns.Items {
-			p, err := me.c.Pods(n.Name).Get(me.Name)
+			p, err := me.c.CoreV1().Pods(n.Name).Get(me.Name, metav1.GetOptions{})
 
 			// If there is no error, we got a matching pod.
 			if err == nil {
@@ -199,7 +203,7 @@ func (me *Me) findPodInNamespaces(selector string) (*api.Pod, string, error) {
 	}
 
 	// If we get here, it's really the last ditch.
-	p, err := me.c.Pods("default").Get(me.Name)
+	p, err := me.c.CoreV1().Pods("default").Get(me.Name, metav1.GetOptions{})
 	return p, "default", err
 }
 

aboutme/aboutme_test.go

@@ -6,11 +6,11 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/kubernetes/pkg/client/restclient"
+	"k8s.io/client-go/rest"
 )
 
 func TestFromEnv(t *testing.T) {
-	if _, err := restclient.InClusterConfig(); err != nil {
+	if _, err := rest.InClusterConfig(); err != nil {
 		t.Skip("This can only be run inside Kubernetes. Skipping.")
 	}
 

etcd/members.go

@@ -7,10 +7,10 @@ import (
 	"github.com/Masterminds/cookoo"
 	"github.com/Masterminds/cookoo/log"
 	"github.com/coreos/etcd/client"
-	"github.com/deis/pkg/k8s"
-	"k8s.io/kubernetes/pkg/api"
-
-	"k8s.io/kubernetes/pkg/labels"
+	"k8s.io/apimachinery/pkg/labels"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
 )
 
 // AddMember Add a new member to the cluster.
@@ -96,7 +96,12 @@ func RemoveStaleMembers(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo
 	ns := p.Get("namespace", "default").(string)
 
 	// Should probably pass in the client from the context.
-	klient, err := k8s.PodClient()
+	config, err := rest.InClusterConfig()
+	if err != nil {
+		log.Errf(c, "Could not get Kubernetes in-cluster config: %s", err)
+		return nil, err
+	}
+	clientset, err := kubernetes.NewForConfig(config)
 	if err != nil {
 		log.Errf(c, "Could not create a Kubernetes client: %s", err)
 		return nil, err
@@ -124,7 +129,7 @@ func RemoveStaleMembers(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo
 		log.Errf(c, "Selector failed to parse: %s", err)
 		return nil, err
 	}
-	pods, err := klient.Pods(ns).List(api.ListOptions{LabelSelector: labelSelector})
+	pods, err := clientset.CoreV1().Pods(ns).List(metav1.ListOptions{LabelSelector: labelSelector.String()})
 	if err != nil {
 		return nil, err
 	}