Merge pull request #5264 from ds-ms/waitIngress

Wait for ingress host to be ready

pkg/kube/wait.go

@@ -52,6 +52,7 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error {
 		services := []v1.Service{}
 		pvc := []v1.PersistentVolumeClaim{}
 		deployments := []deployment{}
+		ingresses := []extensions.Ingress{}
 		for _, v := range created {
 			switch value := asVersionedOrUnstructured(v).(type) {
 			case *v1.ReplicationController:
@@ -208,9 +209,15 @@ func (c *Client) waitForResources(timeout time.Duration, created Result) error {
 					return false, err
 				}
 				services = append(services, *svc)
+			case *extensions.Ingress:
+				ingress, err := kcs.ExtensionsV1beta1().Ingresses(value.Namespace).Get(value.Name, metav1.GetOptions{})
+				if err != nil {
+					return false, err
+				}
+				ingresses = append(ingresses, *ingress)
 			}
 		}
-		isReady := c.podsReady(pods) && c.servicesReady(services) && c.volumesReady(pvc) && c.deploymentsReady(deployments)
+		isReady := c.podsReady(pods) && c.servicesReady(services) && c.volumesReady(pvc) && c.deploymentsReady(deployments) && c.ingressesReady(ingresses)
 		return isReady, nil
 	})
 }
@@ -285,3 +292,13 @@ func isPodReady(pod *v1.Pod) bool {
 	}
 	return false
 }
+
+func (c *Client) ingressesReady(ingresses []extensions.Ingress) bool {
+	for _, ingress := range ingresses {
+		if &ingress.Status == nil || len(ingress.Status.LoadBalancer.Ingress) == 0 {
+			c.Log("Ingress is not ready: %s/%s", ingress.GetNamespace(), ingress.GetName())
+			return false
+		}
+	}
+	return true
+}