github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45005 from FengyunPan/fix-e2e-federation

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 45005, 43053)

[Federation]Fix e2e_federation: pass clusterIngress out

None
This commit is contained in:
Kubernetes Submit Queue 2017-05-03 01:07:05 -07:00 committed by GitHub
commit d2a31cf321
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e_federation/ingress.go
View File

@ -323,7 +323,8 @@ func waitForIngressOrFail(clientset *kubeclientset.Clientset, namespace string,
By(fmt.Sprintf("Fetching a federated ingress shard of ingress %q in namespace %q from cluster", ingress.Name, namespace))
var clusterIngress *v1beta1.Ingress
err := wait.PollImmediate(framework.Poll, timeout, func() (bool, error) {
clusterIngress, err := clientset.Ingresses(namespace).Get(ingress.Name, metav1.GetOptions{})
var err error
clusterIngress, err = clientset.Ingresses(namespace).Get(ingress.Name, metav1.GetOptions{})
if (!present) && errors.IsNotFound(err) { // We want it gone, and it's gone.
By(fmt.Sprintf("Success: shard of federated ingress %q in namespace %q in cluster is absent", ingress.Name, namespace))
return true, nil // Success