upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-04-23 07:07:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #6597 from thomastaylor312/feat/ingress_wait

Browse source 
feat(wait): Ports ingress wait to v3
This commit is contained in:
Taylor Thomas 2019-10-07 15:39:15 -06:00 committed by GitHub
commit 5e2071caef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkg/kube/wait.go
View file

@ -27,6 +27,7 @@ import (
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
networkingv1beta1 "k8s.io/api/networking/v1beta1"
apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
@ -175,6 +176,14 @@ func (w *waiter) waitForResources(created ResourceList) error {
if !w.statefulSetReady(sts) {
return false, nil
}
case *extensionsv1beta1.Ingress, *networkingv1beta1.Ingress:
ing, err := w.c.NetworkingV1beta1().Ingresses(v.Namespace).Get(v.Name, metav1.GetOptions{})
if err != nil {
return false, err
}
if !w.ingressReady(ing) {
return false, nil
}
case *corev1.ReplicationController:
ok, err = w.podsReadyForObject(value.Namespace, value)
@ -345,6 +354,14 @@ func (w *waiter) statefulSetReady(sts *appsv1.StatefulSet) bool {
return true
}
func (w *waiter) ingressReady(ing *networkingv1beta1.Ingress) bool {
if len(ing.Status.LoadBalancer.Ingress) == 0 {
w.log("Ingress is not ready: %s/%s", ing.GetNamespace(), ing.GetName())
return false
}
return true
}
func getPods(client kubernetes.Interface, namespace, selector string) ([]corev1.Pod, error) {
list, err := client.CoreV1().Pods(namespace).List(metav1.ListOptions{
LabelSelector: selector,