From 31058e0bc9fe65e34b27d924ddc21713723c4ec5 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <sttts@redhat.com>
Date: Fri, 21 Oct 2016 13:22:43 +0200
Subject: [PATCH] Make GenericApiServer.Run interruptable and fail on first
 listen

---
 apiserver/apiserver.go   | 4 ++--
 apiserver/server/main.go | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apiserver/apiserver.go b/apiserver/apiserver.go
index d1ff0d80..72d1f77f 100644
--- a/apiserver/apiserver.go
+++ b/apiserver/apiserver.go
@@ -60,7 +60,7 @@ func NewServerRunOptions() *genericoptions.ServerRunOptions {
 	return serverOptions
 }
 
-func Run(serverOptions *genericoptions.ServerRunOptions) error {
+func Run(serverOptions *genericoptions.ServerRunOptions, stopCh <-chan struct{}) error {
 	// Set ServiceClusterIPRange
 	_, serviceClusterIPRange, _ := net.ParseCIDR("10.0.0.0/24")
 	serverOptions.ServiceClusterIPRange = *serviceClusterIPRange
@@ -105,6 +105,6 @@ func Run(serverOptions *genericoptions.ServerRunOptions) error {
 	if err := s.InstallAPIGroup(&apiGroupInfo); err != nil {
 		return fmt.Errorf("Error in installing API: %v", err)
 	}
-	s.PrepareRun().Run()
+	s.PrepareRun().Run(stopCh)
 	return nil
 }
diff --git a/apiserver/server/main.go b/apiserver/server/main.go
index a145adba..5c69edf7 100644
--- a/apiserver/server/main.go
+++ b/apiserver/server/main.go
@@ -19,6 +19,7 @@ package main
 import (
 	"k8s.io/kubernetes/examples/apiserver"
 	"k8s.io/kubernetes/pkg/util/flag"
+	"k8s.io/kubernetes/pkg/util/wait"
 
 	"github.com/golang/glog"
 	"github.com/spf13/pflag"
@@ -32,7 +33,7 @@ func main() {
 	serverRunOptions.AddEtcdStorageFlags(pflag.CommandLine)
 	flag.InitFlags()
 
-	if err := apiserver.Run(serverRunOptions); err != nil {
+	if err := apiserver.Run(serverRunOptions, wait.NeverStop); err != nil {
 		glog.Fatalf("Error in bringing up the server: %v", err)
 	}
 }