retry on apiserver insecure listen failures

This is a backport of: kubernetes#28797
aaronlevy · Aug 27, 2016 · 34d72cd · 34d72cd
1 parent 1625f6a
commit 34d72cd
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go
@@ -731,8 +731,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.