github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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
parent 82913c3112 46be5482d0
commit fe24da8478
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/networking.go
View File

@@ -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.