github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8128 from brendandburns/e2e

Browse Source 
Switch networking e2e to v1beta3.  Update the network-tester container.
This commit is contained in:
Rohit Jnagal 2015-05-13 10:27:03 -07:00
commit fe24da8478
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/for-tests/network-tester/Makefile
View File

@ -1,6 +1,7 @@
all: push all: push
TAG = 1.1 # Set this to the *next* version to prevent accidentally overwriting the existing image.
TAG = 1.4
webserver: webserver.go webserver: webserver.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./webserver.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./webserver.go

4
contrib/for-tests/network-tester/webserver.go
View File

@ -206,9 +206,9 @@ func contactOthers(state *State) {
masterRO := url.URL{ masterRO := url.URL{
Scheme: "http", Scheme: "http",
Host: os.Getenv("KUBERNETES_RO_SERVICE_HOST") + ":" + os.Getenv("KUBERNETES_RO_SERVICE_PORT"), Host: os.Getenv("KUBERNETES_RO_SERVICE_HOST") + ":" + os.Getenv("KUBERNETES_RO_SERVICE_PORT"),
Path: "/api/v1beta1", Path: "/api/" + latest.Version,
} }
client := &client.Client{client.NewRESTClient(&masterRO, "v1beta1", latest.Codec, true, 5, 10)} client := &client.Client{client.NewRESTClient(&masterRO, latest.Version, latest.Codec, false, 5, 10)}
// Do this repeatedly, in case there's some propagation delay with getting // Do this repeatedly, in case there's some propagation delay with getting
// newly started pods into the endpoints list. // newly started pods into the endpoints list.

4
test/e2e/networking.go
View File

@ -23,8 +23,6 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client" "github.com/GoogleCloudPlatform/kubernetes/pkg/client"
//"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"
//"github.com/GoogleCloudPlatform/kubernetes/pkg/clientauth"
"github.com/GoogleCloudPlatform/kubernetes/pkg/fields" "github.com/GoogleCloudPlatform/kubernetes/pkg/fields"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels" "github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/util"
@ -57,7 +55,7 @@ func LaunchNetTestPodPerNode(nodes *api.NodeList, name string, c *client.Client,
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "webserver", Name: "webserver",
Image: "gcr.io/google_containers/nettest:1.1", Image: "gcr.io/google_containers/nettest:1.3",
Args: []string{ Args: []string{
"-service=" + name, "-service=" + name,
//peers >= totalPods should be asserted by the container. //peers >= totalPods should be asserted by the container.