github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2016-10-04 03:24:34 -07:00 committed by GitHub
commit ee77d4e6ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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) {