github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38643 from bprashanth/ing_avoid_nodeport

Browse Source 
Automatic merge from submit-queue

Don't check nodeport for nginx ingress

Services behind a standard nginx ingress don't need nodeport, so don't check that.
This commit is contained in:
Kubernetes Submit Queue
2016-12-16 10:46:56 -08:00
committed by GitHub
parent 9bc98e2a38 ee6e4bd832
commit 84d0fbdb2e
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/ingress.go
View File

@@ -115,7 +115,7 @@ var _ = framework.KubeDescribe("Loadbalancing: L7", func() {
By(t.entryLog)
t.execute()
By(t.exitLog)
jig.waitForIngress()
jig.waitForIngress(true)
}
})
@@ -197,7 +197,7 @@ var _ = framework.KubeDescribe("Loadbalancing: L7", func() {
By(t.entryLog)
t.execute()
By(t.exitLog)
jig.waitForIngress()
jig.waitForIngress(false)
}
})
})