github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #33161 from madhusudancs/fed-svc-lb-inge2e-cleanup 

Automatic merge from submit-queue

Minor Ingress tests cleanup, that includes service shard and GCE resource cleanups in underlying clusters.

Follow up for #32810.

cc @kubernetes/sig-cluster-federation
pull/6/head
Kubernetes Submit Queue 2016-09-21 22:51:31 -07:00 committed by GitHub
parent e69c8f142c 898f618275
commit c31edb2ae6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,7 @@ var _ = framework.KubeDescribe("Federated ingresses [Feature:Federation]", func(
// Create/delete ingress api objects // Create/delete ingress api objects
// Validate federation apiserver, does not rely on underlying clusters or federation ingress controller. // Validate federation apiserver, does not rely on underlying clusters or federation ingress controller.
Describe("Ingress objects", func() { Describe("Federated Ingresses", func() {
AfterEach(func() { AfterEach(func() {
nsName := f.FederationNamespace.Name nsName := f.FederationNamespace.Name
// Delete registered ingresses. // Delete registered ingresses.
@ -137,6 +137,7 @@ var _ = framework.KubeDescribe("Federated ingresses [Feature:Federation]", func(
deleteBackendPodsOrFail(clusters, ns) deleteBackendPodsOrFail(clusters, ns)
if service != nil { if service != nil {
deleteServiceOrFail(f.FederationClientset_1_4, ns, service.Name) deleteServiceOrFail(f.FederationClientset_1_4, ns, service.Name)
cleanupServiceShardsAndProviderResources(ns, service, clusters)
service = nil service = nil
} else { } else {
By("No service to delete. Service is nil") By("No service to delete. Service is nil")
@ -164,6 +165,7 @@ var _ = framework.KubeDescribe("Federated ingresses [Feature:Federation]", func(
} }
// 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() { 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()