github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11035 from nikhiljindal/nettest

Browse Source 
Updating nettest image to latest code
This commit is contained in:
Brendan Burns 2015-07-09 22:08:01 -07:00
commit 86f54b4d05
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
all: push all: push
# Set this to the *next* version to prevent accidentally overwriting the existing image. # Set this to the *next* version to prevent accidentally overwriting the existing image.
TAG = 1.5 TAG = 1.6
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

2
contrib/for-tests/network-tester/rc.json
View File

@ -22,7 +22,7 @@
"containers": [ "containers": [
{ {
"name": "webserver", "name": "webserver",
"image": "gcr.io/google_containers/nettest:1.4", "image": "gcr.io/google_containers/nettest:1.6",
"imagePullPolicy": "Always", "imagePullPolicy": "Always",
"args": [ "args": [
"-service=nettest", "-service=nettest",

2
test/e2e/networking.go
View File

@ -162,7 +162,7 @@ var _ = Describe("Networking", func() {
"Rerun it with at least two nodes to get complete coverage.") "Rerun it with at least two nodes to get complete coverage.")
} }
podNames := LaunchNetTestPodPerNode(f, nodes, svcname, "1.4") podNames := LaunchNetTestPodPerNode(f, nodes, svcname, "1.6")
// Clean up the pods // Clean up the pods
defer func() { defer func() {

2
test/e2e/pre_stop.go
View File

@ -43,7 +43,7 @@ func testPreStop(c *client.Client, ns string) {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "server", Name: "server",
Image: "gcr.io/google_containers/nettest:1.3", Image: "gcr.io/google_containers/nettest:1.6",
Ports: []api.ContainerPort{{ContainerPort: 8080}}, Ports: []api.ContainerPort{{ContainerPort: 8080}},
}, },
}, },