Merge pull request #25 from kmala/master

ref(k8s):update k8s api to 1.2.4

Author: kmala

aboutme/aboutme.go

@@ -184,7 +184,7 @@ func (me *Me) findPodInNamespaces(selector string) (*api.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(s, nil)
+		ns, err := me.c.Namespaces().List(api.ListOptions{LabelSelector: s})
 		if err != nil {
 			return nil, "default", err
 		}

aboutme/aboutme_test.go

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

etcd/members.go

@@ -8,6 +8,7 @@ import (
 	"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"
 )
@@ -123,7 +124,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(labelSelector, nil)
+	pods, err := klient.Pods(ns).List(api.ListOptions{LabelSelector: labelSelector})
 	if err != nil {
 		return nil, err
 	}