|
|
@ -176,7 +176,7 @@ func (w *waiter) waitForResources(created ResourceList) error {
|
|
|
|
if !w.statefulSetReady(sts) {
|
|
|
|
if !w.statefulSetReady(sts) {
|
|
|
|
return false, nil
|
|
|
|
return false, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
case *extensionsv1beta1.Ingress, *networkingv1beta1.Ingress:
|
|
|
|
case *networkingv1beta1.Ingress:
|
|
|
|
ing, err := w.c.NetworkingV1beta1().Ingresses(v.Namespace).Get(v.Name, metav1.GetOptions{})
|
|
|
|
ing, err := w.c.NetworkingV1beta1().Ingresses(v.Namespace).Get(v.Name, metav1.GetOptions{})
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
return false, err
|
|
|
|
return false, err
|
|
|
@ -184,6 +184,14 @@ func (w *waiter) waitForResources(created ResourceList) error {
|
|
|
|
if !w.ingressReady(ing) {
|
|
|
|
if !w.ingressReady(ing) {
|
|
|
|
return false, nil
|
|
|
|
return false, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
case *extensionsv1beta1.Ingress:
|
|
|
|
|
|
|
|
ing, err := w.c.ExtensionsV1beta1().Ingresses(v.Namespace).Get(v.Name, metav1.GetOptions{})
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return false, err
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if !w.ingressReady(ing) {
|
|
|
|
|
|
|
|
return false, nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
case *corev1.ReplicationController:
|
|
|
|
case *corev1.ReplicationController:
|
|
|
|
ok, err = w.podsReadyForObject(value.Namespace, value)
|
|
|
|
ok, err = w.podsReadyForObject(value.Namespace, value)
|
|
|
|