diff --git a/contrib/for-tests/network-tester/Makefile b/contrib/for-tests/network-tester/Makefile index 91dc65a29e5..4834679d471 100644 --- a/contrib/for-tests/network-tester/Makefile +++ b/contrib/for-tests/network-tester/Makefile @@ -1,6 +1,7 @@ all: push -TAG = 1.1 +# Set this to the *next* version to prevent accidentally overwriting the existing image. +TAG = 1.4 webserver: webserver.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./webserver.go diff --git a/contrib/for-tests/network-tester/webserver.go b/contrib/for-tests/network-tester/webserver.go index 0cea0c50f4d..384cc9ab9b0 100644 --- a/contrib/for-tests/network-tester/webserver.go +++ b/contrib/for-tests/network-tester/webserver.go @@ -206,9 +206,9 @@ func contactOthers(state *State) { masterRO := url.URL{ Scheme: "http", 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 // newly started pods into the endpoints list. diff --git a/test/e2e/networking.go b/test/e2e/networking.go index 401c3f397ef..e3f2f282d13 100644 --- a/test/e2e/networking.go +++ b/test/e2e/networking.go @@ -23,8 +23,6 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/api" "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/labels" "github.com/GoogleCloudPlatform/kubernetes/pkg/util" @@ -57,7 +55,7 @@ func LaunchNetTestPodPerNode(nodes *api.NodeList, name string, c *client.Client, Containers: []api.Container{ { Name: "webserver", - Image: "gcr.io/google_containers/nettest:1.1", + Image: "gcr.io/google_containers/nettest:1.3", Args: []string{ "-service=" + name, //peers >= totalPods should be asserted by the container.