github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 05:21:58 +00:00
Code Issues Projects Releases Wiki Activity

fix the left comments for federated ingress e2e

Browse Source
This commit is contained in:
mfanjie 2016-09-07 15:53:46 +08:00
parent 8d00825481
commit d3b00dc0b1
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,27 +308,27 @@ func updateIngressOrFail(clientset *federation_release_1_4.Clientset, namespace
}, },
} }
for MaxRetriesOnFederatedApiserver := 0; MaxRetriesOnFederatedApiserver < 3; MaxRetriesOnFederatedApiserver++ { err = waitForFederatedIngressExists(clientset, namespace, FederatedIngressName, FederatedIngressTimeout)
_, err = clientset.Extensions().Ingresses(namespace).Get(FederatedIngressName) if err != nil {
if err != nil { framework.Failf("failed to get ingress %q: %v", FederatedIngressName, err)
framework.Failf("failed to get ingress %q: %v", FederatedIngressName, err) }
} for i := 0; i < MaxRetriesOnFederatedApiserver; i++ {
newIng, err = clientset.Extensions().Ingresses(namespace).Update(ingress) newIng, err = clientset.Extensions().Ingresses(namespace).Update(ingress)
if err == nil { if err == nil {
describeIng(namespace) describeIng(namespace)
return return newIng
} }
if !errors.IsConflict(err) && !errors.IsServerTimeout(err) { if !errors.IsConflict(err) && !errors.IsServerTimeout(err) {
framework.Failf("failed to update ingress %q: %v", FederatedIngressName, err) framework.Failf("failed to update ingress %q: %v", FederatedIngressName, err)
} }
} }
framework.Failf("too many retries updating ingress %q", FederatedIngressName) framework.Failf("too many retries updating ingress %q", FederatedIngressName)
return newIng return nil
} }
func (j *federationTestJig) waitForFederatedIngress() { func (j *federationTestJig) waitForFederatedIngress() {
// Wait for the loadbalancer IP. // Wait for the loadbalancer IP.
address, err := WaitForFederatedIngressAddress(j.client, j.ing.Namespace, j.ing.Name, lbPollTimeout) address, err := waitForFederatedIngressAddress(j.client, j.ing.Namespace, j.ing.Name, lbPollTimeout)
if err != nil { if err != nil {
framework.Failf("Ingress failed to acquire an IP address within %v", lbPollTimeout) framework.Failf("Ingress failed to acquire an IP address within %v", lbPollTimeout)
} }
@ -360,7 +360,7 @@ func newFederationTestJig(c *federation_release_1_4.Clientset) *federationTestJi
} }
// WaitForFederatedIngressAddress waits for the Ingress to acquire an address. // WaitForFederatedIngressAddress waits for the Ingress to acquire an address.
func WaitForFederatedIngressAddress(c *federation_release_1_4.Clientset, ns, ingName string, timeout time.Duration) (string, error) { func waitForFederatedIngressAddress(c *federation_release_1_4.Clientset, ns, ingName string, timeout time.Duration) (string, error) {
var address string var address string
err := wait.PollImmediate(10*time.Second, timeout, func() (bool, error) { err := wait.PollImmediate(10*time.Second, timeout, func() (bool, error) {
ipOrNameList, err := getFederatedIngressAddress(c, ns, ingName) ipOrNameList, err := getFederatedIngressAddress(c, ns, ingName)
@ -374,6 +374,19 @@ func WaitForFederatedIngressAddress(c *federation_release_1_4.Clientset, ns, ing
return address, err return address, err
} }
// waitForFederatedIngressExists waits for the Ingress object exists.
func waitForFederatedIngressExists(c *federation_release_1_4.Clientset, ns, ingName string, timeout time.Duration) error {
err := wait.PollImmediate(10*time.Second, timeout, func() (bool, error) {
_, err := c.Extensions().Ingresses(ns).Get(ingName)
if err != nil {
framework.Logf("Waiting for Ingress %v, error %v", ingName, err)
return false, nil
}
return true, nil
})
return err
}
// getFederatedIngressAddress returns the ips/hostnames associated with the Ingress. // getFederatedIngressAddress returns the ips/hostnames associated with the Ingress.
func getFederatedIngressAddress(client *federation_release_1_4.Clientset, ns, name string) ([]string, error) { func getFederatedIngressAddress(client *federation_release_1_4.Clientset, ns, name string) ([]string, error) {
ing, err := client.Extensions().Ingresses(ns).Get(name) ing, err := client.Extensions().Ingresses(ns).Get(name)