From 55b0bf0d2204626be2896cf85427bb57768aa9f2 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Thu, 17 Sep 2015 16:14:03 -0700 Subject: [PATCH] fix e2e --- test/e2e/kubeproxy.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/test/e2e/kubeproxy.go b/test/e2e/kubeproxy.go index 0f46b270b05..a3a58c59c4e 100644 --- a/test/e2e/kubeproxy.go +++ b/test/e2e/kubeproxy.go @@ -19,18 +19,20 @@ package e2e import ( "encoding/json" "fmt" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" "io/ioutil" - api "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/latest" - client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/util" - "k8s.io/kubernetes/pkg/util/wait" "net/http" "strconv" "strings" "time" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + api "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/unversioned" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" ) const ( @@ -272,7 +274,7 @@ func (config *KubeProxyTestConfig) ssh(cmd string) string { func (config *KubeProxyTestConfig) createNetShellPodSpec(podName string) *api.Pod { pod := &api.Pod{ - TypeMeta: api.TypeMeta{ + TypeMeta: unversioned.TypeMeta{ Kind: "Pod", APIVersion: latest.GroupOrDie("").Version, }, @@ -315,7 +317,7 @@ func (config *KubeProxyTestConfig) createNetShellPodSpec(podName string) *api.Po func (config *KubeProxyTestConfig) createTestPodSpec() *api.Pod { pod := &api.Pod{ - TypeMeta: api.TypeMeta{ + TypeMeta: unversioned.TypeMeta{ Kind: "Pod", APIVersion: latest.GroupOrDie("").Version, },