UPSTREAM: <carry>: openshift-kube-apiserver: add openshift-kube-apiserver code

Author: bertinatto

openshift-kube-apiserver/openshiftkubeapiserver/patch.go

@@ -62,7 +62,7 @@ func OpenShiftKubeAPIServerConfigPatch(genericConfig *genericapiserver.Config, k
 	// ADMISSION
 	clusterQuotaMappingController := newClusterQuotaMappingController(kubeInformers.Core().V1().Namespaces(), openshiftInformers.OpenshiftQuotaInformers.Quota().V1().ClusterResourceQuotas())
 	genericConfig.AddPostStartHookOrDie("quota.openshift.io-clusterquotamapping", func(context genericapiserver.PostStartHookContext) error {
-		go clusterQuotaMappingController.Run(5, context.StopCh)
+		go clusterQuotaMappingController.Run(5, context.Done())
 		return nil
 	})
 
@@ -95,7 +95,7 @@ func OpenShiftKubeAPIServerConfigPatch(genericConfig *genericapiserver.Config, k
 	}
 	apiRequestCountController := apirequestcount.NewController(apiserverClient.APIRequestCounts(), nodeFor())
 	genericConfig.AddPostStartHook("openshift.io-api-request-count-filter", func(context genericapiserver.PostStartHookContext) error {
-		go apiRequestCountController.Start(context.StopCh)
+		go apiRequestCountController.Start(context.Done())
 		return nil
 	})
 	genericConfig.BuildHandlerChainFunc, err = BuildHandlerChain(
@@ -113,7 +113,7 @@ func OpenShiftKubeAPIServerConfigPatch(genericConfig *genericapiserver.Config, k
 	genericConfig.ReadyzChecks = append(genericConfig.ReadyzChecks, openshiftAPIServiceReachabilityCheck, oauthAPIServiceReachabilityCheck)
 
 	genericConfig.AddPostStartHookOrDie("openshift.io-startkubeinformers", func(context genericapiserver.PostStartHookContext) error {
-		go openshiftInformers.Start(context.StopCh)
+		go openshiftInformers.Start(context.Done())
 		return nil
 	})
 	genericConfig.AddPostStartHookOrDie("openshift.io-openshift-apiserver-reachable", func(context genericapiserver.PostStartHookContext) error {

openshift-kube-apiserver/openshiftkubeapiserver/sdn_readyz_wait.go

@@ -162,7 +162,7 @@ func (c *aggregatedAPIServiceAvailabilityCheck) checkForConnection(context gener
 		// if we timeout, always return ok so that we can start from a case where all kube-apiservers are down and the SDN isn't coming up
 		utilruntime.HandleError(fmt.Errorf("%s never reached apiserver", c.Name()))
 		return
-	case <-context.StopCh:
+	case <-context.Done():
 		utilruntime.HandleError(fmt.Errorf("%s interrupted", c.Name()))
 		return
 	case <-noAggregatedAPIServer: