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

Merge pull request #32539 from quinton-hoole/2016-09-12-enable-remaining-federated-ingress-e2e-tests

Browse Source 
Automatic merge from submit-queue

Re-enable Federated Ingress e2e test to check connectivity to global load balancer

...Now that it works properly.

Should not merge before #31600, as it will fail until then.
This commit is contained in:
Kubernetes Submit Queue
2016-09-13 11:07:56 -07:00
committed by GitHub
parent cd1ab76c5a a4696bb8c8
commit 3206be19bd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/federated-ingress.go
View File

@@ -149,7 +149,7 @@ var _ = framework.KubeDescribe("Federated ingresses [Feature:Federation]", func(
} }
}) })
PIt("should be able to discover a federated ingress service", func() { PIt("should be able to discover a federated ingress service via DNS", func() {
// we are about the ingress name // we are about the ingress name
svcDNSNames := []string{ svcDNSNames := []string{
fmt.Sprintf("%s.%s", FederatedIngressServiceName, ns), fmt.Sprintf("%s.%s", FederatedIngressServiceName, ns),
@@ -163,7 +163,8 @@ var _ = framework.KubeDescribe("Federated ingresses [Feature:Federation]", func(
discoverService(f, DNSName, true, "federated-ingress-e2e-discovery-pod-"+strconv.Itoa(i)) discoverService(f, DNSName, true, "federated-ingress-e2e-discovery-pod-"+strconv.Itoa(i))
} }
// TODO check dns record in global dns server // TODO check dns record in global dns server
})
It("should be able to connect to a federated ingress via its load balancer", func() {
// check the traffic on federation ingress // check the traffic on federation ingress
jig.waitForFederatedIngress() jig.waitForFederatedIngress()
}) })