Skip to content

K
k3s
Commit d2a31cf3 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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

Automatic merge from submit-queue (batch tested with PRs 45005, 43053) [Federation]Fix e2e_federation: pass clusterIngress out None
parents 2371a70b 798e0dc7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
test/e2e_federation/ingress.go
View file @ d2a31cf3
...@@ -323,7 +323,8 @@ func waitForIngressOrFail(clientset *kubeclientset.Clientset, namespace string, ...@@ -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)) By(fmt.Sprintf("Fetching a federated ingress shard of ingress %q in namespace %q from cluster", ingress.Name, namespace))
var clusterIngress *v1beta1.Ingress var clusterIngress *v1beta1.Ingress
err := wait.PollImmediate(framework.Poll, timeout, func() (bool, error) { 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. 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)) By(fmt.Sprintf("Success: shard of federated ingress %q in namespace %q in cluster is absent", ingress.Name, namespace))
return true, nil // Success return true, nil // Success
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment