From 25ac0dd0303a2824e59fb612ca5ac2557d467cfe Mon Sep 17 00:00:00 2001
From: Aaron Levy <aaronjlevy@gmail.com>
Date: Mon, 11 Jul 2016 14:08:07 -0700
Subject: [PATCH] retry on apiserver insecure listen failures

---
 pkg/genericapiserver/genericapiserver.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go
index 98c0f45dba..261097e57f 100644
--- a/pkg/genericapiserver/genericapiserver.go
+++ b/pkg/genericapiserver/genericapiserver.go
@@ -750,8 +750,18 @@ func (s *GenericAPIServer) Run(options *options.ServerRunOptions) {
 		Handler:        apiserver.RecoverPanics(handler),
 		MaxHeaderBytes: 1 << 20,
 	}
+
 	glog.Infof("Serving insecurely on %s", insecureLocation)
-	glog.Fatal(http.ListenAndServe())
+	go func() {
+		defer utilruntime.HandleCrash()
+		for {
+			if err := http.ListenAndServe(); err != nil {
+				glog.Errorf("Unable to listen for insecure (%v); will try again.", err)
+			}
+			time.Sleep(15 * time.Second)
+		}
+	}()
+	select {}
 }
 
 // Exposes the given group version in API.