github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33853 from madhusudancs/fed-e2e-cleanup-v3

Browse Source 
Automatic merge from submit-queue

Explicitly return nil for underlying cluster's service in Federated Service e2e cleanup function.
This commit is contained in:
Kubernetes Submit Queue 2016-10-02 14:27:41 -07:00 committed by GitHub
commit 158dc1a863
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/federation-util.go
View File

@ -300,14 +300,18 @@ func cleanupServiceShardsAndProviderResources(namespace string, service *v1.Serv
// Get failed with an error, try again. // Get failed with an error, try again.
framework.Logf("Failed to find service %q in namespace %q, in cluster %q: %v. Trying again in %s", service.Name, namespace, name, err, framework.Poll) framework.Logf("Failed to find service %q in namespace %q, in cluster %q: %v. Trying again in %s", service.Name, namespace, name, err, framework.Poll)
return false, nil return false, nil
} else if errors.IsNotFound(err) {
cSvc = nil
By(fmt.Sprintf("Service %q in namespace %q in cluster %q not found", service.Name, namespace, name))
return true, err
} }
By(fmt.Sprintf("Service %q in namespace %q in cluster %q found", service.Name, namespace, name)) By(fmt.Sprintf("Service %q in namespace %q in cluster %q found", service.Name, namespace, name))
return true, nil return true, err
}) })
if err != nil || cSvc == nil { if err != nil || cSvc == nil {
By(fmt.Sprintf("Failed to find service %q in namespace %q, in cluster %q in %s", service.Name, namespace, name, FederatedServiceTimeout)) By(fmt.Sprintf("Failed to find service %q in namespace %q, in cluster %q in %s", service.Name, namespace, name, FederatedServiceTimeout))
return continue
} }
err = cleanupServiceShard(c.Clientset, name, namespace, cSvc, FederatedServiceTimeout) err = cleanupServiceShard(c.Clientset, name, namespace, cSvc, FederatedServiceTimeout)