From c727e27602e36f9ecec550d58c7f3f5ccbc9e5b8 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <sttts@redhat.com>
Date: Thu, 22 Sep 2016 13:02:52 +0200
Subject: [PATCH] Reduce genericapiserver api surface

---
 examples/apiserver/apiserver.go               |  2 +-
 pkg/genericapiserver/genericapiserver.go      | 12 +-----------
 pkg/genericapiserver/genericapiserver_test.go |  4 +++-
 pkg/master/master.go                          |  6 ++++--
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/examples/apiserver/apiserver.go b/examples/apiserver/apiserver.go
index 04b894792ed1..dc0a1d85136b 100644
--- a/examples/apiserver/apiserver.go
+++ b/examples/apiserver/apiserver.go
@@ -97,7 +97,7 @@ func Run(serverOptions *genericoptions.ServerRunOptions) error {
 		Scheme:               api.Scheme,
 		NegotiatedSerializer: api.Codecs,
 	}
-	if err := s.InstallAPIGroups([]genericapiserver.APIGroupInfo{apiGroupInfo}); err != nil {
+	if err := s.InstallAPIGroup(&apiGroupInfo); err != nil {
 		return fmt.Errorf("Error in installing API: %v", err)
 	}
 	s.Run(serverOptions)
diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go
index 5ec7a55ec219..bc69a3216994 100644
--- a/pkg/genericapiserver/genericapiserver.go
+++ b/pkg/genericapiserver/genericapiserver.go
@@ -225,16 +225,6 @@ func NewHandlerContainer(mux *http.ServeMux, s runtime.NegotiatedSerializer) *re
 	return container
 }
 
-// Exposes the given group versions in API. Helper method to install multiple group versions at once.
-func (s *GenericAPIServer) InstallAPIGroups(groupsInfo []APIGroupInfo) error {
-	for _, apiGroupInfo := range groupsInfo {
-		if err := s.InstallAPIGroup(&apiGroupInfo); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 // Installs handler at /apis to list all group versions for discovery
 func (s *GenericAPIServer) installGroupsDiscoveryHandler() {
 	apiserver.AddApisWebService(s.Serializer, s.HandlerContainer, s.apiPrefix, func(req *restful.Request) []unversioned.APIGroup {
@@ -390,7 +380,7 @@ func (s *GenericAPIServer) Run(options *options.ServerRunOptions) {
 	select {}
 }
 
-// Exposes the given group version in API.
+// Exposes the given api group in the API.
 func (s *GenericAPIServer) InstallAPIGroup(apiGroupInfo *APIGroupInfo) error {
 	apiPrefix := s.apiPrefix
 	if apiGroupInfo.IsLegacyGroup {
diff --git a/pkg/genericapiserver/genericapiserver_test.go b/pkg/genericapiserver/genericapiserver_test.go
index adaa69fbf976..5be8a4cb2428 100644
--- a/pkg/genericapiserver/genericapiserver_test.go
+++ b/pkg/genericapiserver/genericapiserver_test.go
@@ -138,7 +138,9 @@ func TestInstallAPIGroups(t *testing.T) {
 			NegotiatedSerializer:         api.Codecs,
 		},
 	}
-	s.InstallAPIGroups(apiGroupsInfo)
+	for i := range apiGroupsInfo {
+		s.InstallAPIGroup(&apiGroupsInfo[i])
+	}
 
 	server := httptest.NewServer(s.HandlerContainer.ServeMux)
 	defer server.Close()
diff --git a/pkg/master/master.go b/pkg/master/master.go
index f6316ee68fcd..52176a25294c 100644
--- a/pkg/master/master.go
+++ b/pkg/master/master.go
@@ -331,8 +331,10 @@ func (m *Master) InstallAPIs(c *Config) {
 		apiGroupsInfo = append(apiGroupsInfo, apiGroupInfo)
 	}
 
-	if err := m.InstallAPIGroups(apiGroupsInfo); err != nil {
-		glog.Fatalf("Error in registering group versions: %v", err)
+	for i := range apiGroupsInfo {
+		if err := m.InstallAPIGroup(&apiGroupsInfo[i]); err != nil {
+			glog.Fatalf("Error in registering group versions: %v", err)
+		}
 	}
 }