github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14144 from caesarxuchao/fix-e2e

Browse Source 
fix e2e
This commit is contained in:
Alex Mohr 2015-09-17 16:17:09 -07:00
commit 72046c4302
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/e2e/kubeproxy.go
View File

@ -19,18 +19,20 @@ package e2e
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"io/ioutil" "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" "net/http"
"strconv" "strconv"
"strings" "strings"
"time" "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 ( const (
@ -272,7 +274,7 @@ func (config *KubeProxyTestConfig) ssh(cmd string) string {
func (config *KubeProxyTestConfig) createNetShellPodSpec(podName string) *api.Pod { func (config *KubeProxyTestConfig) createNetShellPodSpec(podName string) *api.Pod {
pod := &api.Pod{ pod := &api.Pod{
TypeMeta: api.TypeMeta{ TypeMeta: unversioned.TypeMeta{
Kind: "Pod", Kind: "Pod",
APIVersion: latest.GroupOrDie("").Version, APIVersion: latest.GroupOrDie("").Version,
}, },
@ -315,7 +317,7 @@ func (config *KubeProxyTestConfig) createNetShellPodSpec(podName string) *api.Po
func (config *KubeProxyTestConfig) createTestPodSpec() *api.Pod { func (config *KubeProxyTestConfig) createTestPodSpec() *api.Pod {
pod := &api.Pod{ pod := &api.Pod{
TypeMeta: api.TypeMeta{ TypeMeta: unversioned.TypeMeta{
Kind: "Pod", Kind: "Pod",
APIVersion: latest.GroupOrDie("").Version, APIVersion: latest.GroupOrDie("").Version,
}, },