thread through stopCh to DestroyFunc (openshift#1671)

partial mitigation for openshift#1649
still many outstanding goroutines by test end

Author: MHBauer

Diff for: cmd/apiserver/app/server/run_server.go

@@ -101,7 +101,7 @@ func runEtcdServer(opts *ServiceCatalogServerOptions, stopCh <-chan struct{}) er
 
 	// make the server
 	glog.V(4).Infoln("Completing API server configuration")
-	server, err := completed.NewServer()
+	server, err := completed.NewServer(stopCh)
 	if err != nil {
 		return fmt.Errorf("error completing API server configuration: %v", err)
 	}

Diff for: pkg/apiserver/config.go

@@ -25,5 +25,5 @@ type Config interface {
 // CompletedConfig is the result of a Config being Complete()-ed. Calling code should call Start()
 // to start a server from its completed config
 type CompletedConfig interface {
-	NewServer() (*ServiceCatalogAPIServer, error)
+	NewServer(stopCh <-chan struct{}) (*ServiceCatalogAPIServer, error)
 }

Diff for: pkg/apiserver/etcd_config.go

@@ -20,6 +20,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/kubernetes-incubator/service-catalog/pkg/registry/servicecatalog/server"
 	"k8s.io/apiserver/pkg/registry/generic"
+	"k8s.io/apiserver/pkg/registry/generic/registry"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/apiserver/pkg/server/storage"
 )
@@ -79,7 +80,7 @@ type completedEtcdConfig struct {
 
 // NewServer creates a new server that can be run. Returns a non-nil error if the server couldn't
 // be created
-func (c completedEtcdConfig) NewServer() (*ServiceCatalogAPIServer, error) {
+func (c completedEtcdConfig) NewServer(stopCh <-chan struct{}) (*ServiceCatalogAPIServer, error) {
 	s, err := createSkeletonServer(c.genericConfig)
 	if err != nil {
 		return nil, err
@@ -110,6 +111,19 @@ func (c completedEtcdConfig) NewServer() (*ServiceCatalogAPIServer, error) {
 		glog.V(4).Infof("Installing API group %v", provider.GroupName())
 		if err := s.GenericAPIServer.InstallAPIGroup(groupInfo); err != nil {
 			glog.Fatalf("Error installing API group %v: %v", provider.GroupName(), err)
+		} else {
+			// we've sucessfully installed, so hook the stopCh to the destroy func of all the sucessfully installed apigroups
+			for _, mappings := range groupInfo.VersionedResourcesStorageMap { // gv to resource mappings
+				for _, storage := range mappings { // resource name (brokers, brokers/status) to backing storage
+					go func() {
+						s, ok := storage.(*registry.Store)
+						if ok {
+							<-stopCh
+							s.DestroyFunc()
+						}
+					}()
+				}
+			}
 		}
 	}
 

Diff for: test/integration/controller_instance_test.go

@@ -101,7 +101,6 @@ func TestCreateServiceInstanceNonExistentClusterServiceClassOrPlan(t *testing.T)
 	for _, tc := range cases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
 			ct := &controllerTest{
 				t:      t,
 				broker: getTestBroker(),