From 185fb4f43c0f77664430d7946f2a42a7c468b238 Mon Sep 17 00:00:00 2001 From: Taylor Thomas Date: Fri, 10 Mar 2017 11:02:22 -0800 Subject: [PATCH] fix(tiller): Fixes problem with `--wait` on headless Services Headless services (with `clusterIP` set to `None`) were reporting as not being ready because they didn't have an IP address. This adds a logic check to ignore those services. --- pkg/kube/client.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/kube/client.go b/pkg/kube/client.go index ee2a0af73..a43627416 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -520,7 +520,8 @@ func podsReady(pods []api.Pod) bool { func servicesReady(svc []api.Service) bool { for _, s := range svc { - if !api.IsServiceIPSet(&s) { + // Make sure the service is not explicitly set to "None" before checking the IP + if s.Spec.ClusterIP != api.ClusterIPNone && !api.IsServiceIPSet(&s) { return false } // This checks if the service has a LoadBalancer and that balancer has an Ingress defined