Merge pull request #33977 from quinton-hoole/2016-10-03-return-correct-ingress-in-e2e

Automatic merge from submit-queue Heal the namespaceless ingresses in federation e2e. For createIngressOrFail, it incorrectly returned the ingress passed in as an argument, which does not include the namespace, instead of the ingress returned from the create call (which does). This in turn leads to errors in e2e tests like this: INFO: Waiting for Ingress federated-ingress to acquire IP, error an empty namespace may not be set when a resource name is provided. Self-applying LGTM label, as this is the same code that was LGTM'd by @nikhiljindal in #33502

Merge pull request #33977 from quinton-hoole/2016-10-03-return-correct-ingress-in-e2e
ee77d4e6 · Kubernetes Submit Queue · GitHub · b74f0fc4 · 08acdc9b · ee77d4e6
Commit ee77d4e6 authored Oct 04, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 04, 2016
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

federated-ingress.go test/e2e/federated-ingress.go +2 -2

No files found.
--- a/test/e2e/federated-ingress.go
+++ b/test/e2e/federated-ingress.go
@@ -287,10 +287,10 @@ func createIngressOrFail(clientset *federation_release_1_4.Clientset, namespace 
 		},
 	}
-	_, err := clientset.Extensions().Ingresses(namespace).Create(ingress)
+	newIng, err := clientset.Extensions().Ingresses(namespace).Create(ingress)
 	framework.ExpectNoError(err, "Creating ingress %q in namespace %q", ingress.Name, namespace)
 	By(fmt.Sprintf("Successfully created federated ingress %q in namespace %q", FederatedIngressName, namespace))
-	return ingress
+	return newIng
 }
 func updateIngressOrFail(clientset *federation_release_1_4.Clientset, namespace string) (newIng *v1beta1.Ingress) {