From a4e62297d668feed929e2e78a3740b5a5ee0aef8 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Fri, 16 Sep 2016 14:18:52 -0700 Subject: [PATCH] fix tests --- .../typed/core/v1/pod_expansion.go | 6 +++++ plugin/pkg/client/auth/gcp/gcp.go | 2 +- .../client-go/examples/in-cluster/main.go | 6 ++--- .../client-go/examples/out-of-cluster/main.go | 6 ++--- test/e2e/disruption.go | 22 +++++++++---------- test/e2e/framework/framework.go | 6 ++--- test/e2e/generated_clientset.go | 4 ++-- 7 files changed, 29 insertions(+), 23 deletions(-) diff --git a/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod_expansion.go b/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod_expansion.go index fba1fd069cc..beb61d4ff02 100644 --- a/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod_expansion.go +++ b/pkg/client/clientset_generated/release_1_5/typed/core/v1/pod_expansion.go @@ -19,12 +19,14 @@ package v1 import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" + policy "k8s.io/kubernetes/pkg/apis/policy/v1alpha1" "k8s.io/kubernetes/pkg/client/restclient" ) // The PodExpansion interface allows manually adding extra methods to the PodInterface. type PodExpansion interface { Bind(binding *v1.Binding) error + Evict(eviction *policy.Eviction) error GetLogs(name string, opts *v1.PodLogOptions) *restclient.Request } @@ -33,6 +35,10 @@ func (c *pods) Bind(binding *v1.Binding) error { return c.client.Post().Namespace(c.ns).Resource("pods").Name(binding.Name).SubResource("binding").Body(binding).Do().Error() } +func (c *pods) Evict(eviction *policy.Eviction) error { + return c.client.Post().Namespace(c.ns).Resource("pods").Name(eviction.Name).SubResource("eviction").Body(eviction).Do().Error() +} + // Get constructs a request for getting the logs for a pod func (c *pods) GetLogs(name string, opts *v1.PodLogOptions) *restclient.Request { return c.client.Get().Namespace(c.ns).Name(name).Resource("pods").SubResource("log").VersionedParams(opts, api.ParameterCodec) diff --git a/plugin/pkg/client/auth/gcp/gcp.go b/plugin/pkg/client/auth/gcp/gcp.go index fa5e079f6b5..b7137ec52de 100644 --- a/plugin/pkg/client/auth/gcp/gcp.go +++ b/plugin/pkg/client/auth/gcp/gcp.go @@ -25,7 +25,7 @@ import ( "golang.org/x/oauth2" "golang.org/x/oauth2/google" - clientreporestclient "k8s.io/client-go/1.4/rest" + clientreporestclient "k8s.io/client-go/1.5/rest" "k8s.io/kubernetes/pkg/client/restclient" ) diff --git a/staging/src/k8s.io/client-go/examples/in-cluster/main.go b/staging/src/k8s.io/client-go/examples/in-cluster/main.go index d7858761ea5..b0135a7373a 100644 --- a/staging/src/k8s.io/client-go/examples/in-cluster/main.go +++ b/staging/src/k8s.io/client-go/examples/in-cluster/main.go @@ -20,9 +20,9 @@ import ( "fmt" "time" - "k8s.io/client-go/1.4/kubernetes" - "k8s.io/client-go/1.4/pkg/api" - "k8s.io/client-go/1.4/rest" + "k8s.io/client-go/1.5/kubernetes" + "k8s.io/client-go/1.5/pkg/api" + "k8s.io/client-go/1.5/rest" ) func main() { diff --git a/staging/src/k8s.io/client-go/examples/out-of-cluster/main.go b/staging/src/k8s.io/client-go/examples/out-of-cluster/main.go index 50875d14c00..bedf0dfc4af 100644 --- a/staging/src/k8s.io/client-go/examples/out-of-cluster/main.go +++ b/staging/src/k8s.io/client-go/examples/out-of-cluster/main.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "k8s.io/client-go/1.4/kubernetes" - "k8s.io/client-go/1.4/pkg/api" - "k8s.io/client-go/1.4/tools/clientcmd" + "k8s.io/client-go/1.5/kubernetes" + "k8s.io/client-go/1.5/pkg/api" + "k8s.io/client-go/1.5/tools/clientcmd" ) var ( diff --git a/test/e2e/disruption.go b/test/e2e/disruption.go index 7bad1dee8fa..869070b1895 100644 --- a/test/e2e/disruption.go +++ b/test/e2e/disruption.go @@ -22,13 +22,13 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - release_1_4 "k8s.io/client-go/1.4/kubernetes" - apiapi "k8s.io/client-go/1.4/pkg/api" - "k8s.io/client-go/1.4/pkg/api/unversioned" - api "k8s.io/client-go/1.4/pkg/api/v1" - extensions "k8s.io/client-go/1.4/pkg/apis/extensions/v1beta1" - policy "k8s.io/client-go/1.4/pkg/apis/policy/v1alpha1" - "k8s.io/client-go/1.4/pkg/util/intstr" + "k8s.io/client-go/1.5/kubernetes" + apiapi "k8s.io/client-go/1.5/pkg/api" + "k8s.io/client-go/1.5/pkg/api/unversioned" + api "k8s.io/client-go/1.5/pkg/api/v1" + extensions "k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1" + policy "k8s.io/client-go/1.5/pkg/apis/policy/v1alpha1" + "k8s.io/client-go/1.5/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" ) @@ -44,7 +44,7 @@ const schedulingTimeout = 5 * time.Minute var _ = framework.KubeDescribe("DisruptionController", func() { f := framework.NewDefaultFramework("disruption") var ns string - var cs *release_1_4.Clientset + var cs *kubernetes.Clientset BeforeEach(func() { // skip on GKE since alpha features are disabled @@ -179,7 +179,7 @@ var _ = framework.KubeDescribe("DisruptionController", func() { }) -func createPodDisruptionBudgetOrDie(cs *release_1_4.Clientset, ns string, minAvailable intstr.IntOrString) { +func createPodDisruptionBudgetOrDie(cs *kubernetes.Clientset, ns string, minAvailable intstr.IntOrString) { pdb := policy.PodDisruptionBudget{ ObjectMeta: api.ObjectMeta{ Name: "foo", @@ -194,7 +194,7 @@ func createPodDisruptionBudgetOrDie(cs *release_1_4.Clientset, ns string, minAva Expect(err).NotTo(HaveOccurred()) } -func createPodsOrDie(cs *release_1_4.Clientset, ns string, n int) { +func createPodsOrDie(cs *kubernetes.Clientset, ns string, n int) { for i := 0; i < n; i++ { pod := &api.Pod{ ObjectMeta: api.ObjectMeta{ @@ -218,7 +218,7 @@ func createPodsOrDie(cs *release_1_4.Clientset, ns string, n int) { } } -func createReplicaSetOrDie(cs *release_1_4.Clientset, ns string, size int32, exclusive bool) { +func createReplicaSetOrDie(cs *kubernetes.Clientset, ns string, size int32, exclusive bool) { container := api.Container{ Name: "busybox", Image: "gcr.io/google_containers/echoserver:1.4", diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 744699cbf6d..f5d727bb9b3 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -26,9 +26,9 @@ import ( "sync" "time" - staging "k8s.io/client-go/1.4/kubernetes" - "k8s.io/client-go/1.4/pkg/util/sets" - clientreporestclient "k8s.io/client-go/1.4/rest" + staging "k8s.io/client-go/1.5/kubernetes" + "k8s.io/client-go/1.5/pkg/util/sets" + clientreporestclient "k8s.io/client-go/1.5/rest" "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" diff --git a/test/e2e/generated_clientset.go b/test/e2e/generated_clientset.go index ac3d3dc98ff..0e094684159 100644 --- a/test/e2e/generated_clientset.go +++ b/test/e2e/generated_clientset.go @@ -20,8 +20,8 @@ import ( "strconv" "time" - clientapi "k8s.io/client-go/1.4/pkg/api" - clientv1 "k8s.io/client-go/1.4/pkg/api/v1" + clientapi "k8s.io/client-go/1.5/pkg/api" + clientv1 "k8s.io/client-go/1.5/pkg/api/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/labels"