From 0a2cd24f9de31e3b9851cc9c0d12b0bc93b7470e Mon Sep 17 00:00:00 2001
From: deads2k <deads@redhat.com>
Date: Thu, 16 Mar 2017 11:05:03 -0400
Subject: [PATCH] don't start controllers against unhealthy master

---
 cmd/kube-controller-manager/app/controllermanager.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go
index 479ffa2d7dd..4390fa0574d 100644
--- a/cmd/kube-controller-manager/app/controllermanager.go
+++ b/cmd/kube-controller-manager/app/controllermanager.go
@@ -331,6 +331,13 @@ func getAvailableResources(clientBuilder controller.ControllerClientBuilder) (ma
 			return false, nil
 		}
 
+		healthStatus := 0
+		client.Discovery().RESTClient().Get().AbsPath("/healthz").Do().StatusCode(&healthStatus)
+		if healthStatus != http.StatusOK {
+			glog.Errorf("Server isn't healthy yet.  Waiting a little while.")
+			return false, nil
+		}
+
 		discoveryClient = client.Discovery()
 		return true, nil
 	})