Merge pull request #285 from caseydavenport/client-go

Switch to client-go

Makefile

@@ -14,7 +14,7 @@ test: ut
 ## Use this to populate the vendor directory after checking out the repository.
 ## To update upstream dependencies, delete the glide.lock file first.
 vendor: 
-	glide install -strip-vendor -strip-vcs --cache
+	glide install -strip-vendor
 
 .PHONY: ut
 ## Run the UTs locally.  This requires a local etcd to be running.

glide.yaml

@@ -26,9 +26,4 @@ import:
   version: ^0.10.0
 - package: github.com/termie/go-shutil
 - package: github.com/mitchellh/go-ps
-- package: k8s.io/kubernetes
-  subpackages:
-  - pkg/api
-  - pkg/api/v1
-  - pkg/client/clientset_generated/release_1_4
-  - pkg/client/unversioned/clientcmd
+- package: k8s.io/client-go

lib/backend/k8s/conversion.go

@@ -27,9 +27,9 @@ import (
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
 	cnet "github.com/projectcalico/libcalico-go/lib/net"
 	"github.com/projectcalico/libcalico-go/lib/numorstring"
-	k8sapi "k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/client-go/pkg/api/unversioned"
+	k8sapi "k8s.io/client-go/pkg/api/v1"
+	extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
 )
 
 var (
@@ -123,7 +123,7 @@ func (c converter) isCalicoPod(pod *k8sapi.Pod) bool {
 }
 
 func (c converter) isHostNetworked(pod *k8sapi.Pod) bool {
-	return pod.Spec.SecurityContext != nil && pod.Spec.SecurityContext.HostNetwork == true
+	return pod.Spec.HostNetwork
 }
 
 func (c converter) hasIPAddress(pod *k8sapi.Pod) bool {

lib/backend/k8s/conversion_test.go

@@ -19,10 +19,10 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
-	k8sapi "k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/util/intstr"
+	"k8s.io/client-go/pkg/api/unversioned"
+	k8sapi "k8s.io/client-go/pkg/api/v1"
+	extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
+	"k8s.io/client-go/pkg/util/intstr"
 )
 
 var _ = Describe("Test parsing strings", func() {

lib/backend/k8s/k8s.go

@@ -16,18 +16,20 @@ package k8s
 
 import (
 	goerrors "errors"
+	"time"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/projectcalico/libcalico-go/lib/backend/api"
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
 	"github.com/projectcalico/libcalico-go/lib/errors"
-	k8sapi "k8s.io/kubernetes/pkg/api"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
+	"k8s.io/client-go/kubernetes"
+	k8sapi "k8s.io/client-go/pkg/api/v1"
+	extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
+	"k8s.io/client-go/tools/clientcmd"
 )
 
 type KubeClient struct {
-	clientSet *clientset.Clientset
+	clientSet *kubernetes.Clientset
 	converter converter
 }
 
@@ -79,7 +81,7 @@ func NewKubeClient(kc *KubeConfig) (*KubeClient, error) {
 	}
 
 	// Create the clientset
-	cs, err := clientset.NewForConfig(config)
+	cs, err := kubernetes.NewForConfig(config)
 	if err != nil {
 		return nil, err
 	}
@@ -285,7 +287,12 @@ func (c *KubeClient) listPolicies(l model.PolicyListOptions) ([]*model.KVPair, e
 	}
 
 	// Otherwise, list all NetworkPolicy objects in all Namespaces.
-	networkPolicies, err := c.clientSet.NetworkPolicies("").List(k8sapi.ListOptions{})
+	networkPolicies := extensions.NetworkPolicyList{}
+	err := c.clientSet.Extensions().RESTClient().
+		Get().
+		Resource("networkpolicies").
+		Timeout(10 * time.Second).
+		Do().Into(&networkPolicies)
 	if err != nil {
 		return nil, err
 	}
@@ -309,11 +316,19 @@ func (c *KubeClient) getPolicy(k model.PolicyKey) (*model.KVPair, error) {
 		return nil, goerrors.New("Missing policy name")
 	}
 	namespace, policyName := c.converter.parsePolicyName(k.Name)
-	networkPolicy, err := c.clientSet.NetworkPolicies(namespace).Get(policyName)
+
+	networkPolicy := extensions.NetworkPolicy{}
+	err := c.clientSet.Extensions().RESTClient().
+		Get().
+		Resource("networkpolicies").
+		Namespace(namespace).
+		Name(policyName).
+		Timeout(10 * time.Second).
+		Do().Into(&networkPolicy)
 	if err != nil {
 		return nil, err
 	}
-	return c.converter.networkPolicyToPolicy(networkPolicy)
+	return c.converter.networkPolicyToPolicy(&networkPolicy)
 }
 
 func (c *KubeClient) getReadyStatus(k model.ReadyFlagKey) (*model.KVPair, error) {