add InstallAll method pkg/api

Author: juanvallejo

cmd/oc/oc.go

@@ -12,23 +12,8 @@ import (
 	"github.com/openshift/origin/pkg/cmd/util/serviceability"
 	"github.com/openshift/origin/pkg/oc/cli"
 
-	"k8s.io/kubernetes/pkg/kubectl/scheme"
-
-	apps "github.com/openshift/origin/pkg/apps/apis/apps/install"
-	authz "github.com/openshift/origin/pkg/authorization/apis/authorization/install"
-	build "github.com/openshift/origin/pkg/build/apis/build/install"
-	image "github.com/openshift/origin/pkg/image/apis/image/install"
-	network "github.com/openshift/origin/pkg/network/apis/network/install"
-	oauth "github.com/openshift/origin/pkg/oauth/apis/oauth/install"
-	project "github.com/openshift/origin/pkg/project/apis/project/install"
-	quota "github.com/openshift/origin/pkg/quota/apis/quota/install"
-	route "github.com/openshift/origin/pkg/route/apis/route/install"
-	security "github.com/openshift/origin/pkg/security/apis/security/install"
-	template "github.com/openshift/origin/pkg/template/apis/template/install"
-	user "github.com/openshift/origin/pkg/user/apis/user/install"
-
 	// install all APIs
-	_ "github.com/openshift/origin/pkg/api/install"
+	api "github.com/openshift/origin/pkg/api/install"
 	_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
 	_ "k8s.io/kubernetes/pkg/apis/batch/install"
 	_ "k8s.io/kubernetes/pkg/apis/core/install"
@@ -46,19 +31,7 @@ func main() {
 		runtime.GOMAXPROCS(runtime.NumCPU())
 	}
 
-	// add Origin types to the kubectl scheme
-	apps.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
-	authz.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
-	build.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
-	image.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
-	network.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
-	oauth.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
-	project.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
-	quota.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
-	route.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
-	security.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
-	template.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
-	user.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+	api.InstallAll()
 
 	basename := filepath.Base(os.Args[0])
 	command := cli.CommandFor(basename)

pkg/api/install/install.go

@@ -6,6 +6,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 	kapiv1 "k8s.io/kubernetes/pkg/apis/core/v1"
+	"k8s.io/kubernetes/pkg/kubectl/scheme"
 
 	// we have a strong dependency on kube objects for deployments and scale
 	_ "k8s.io/kubernetes/pkg/apis/apps/install"
@@ -21,19 +22,20 @@ import (
 	_ "k8s.io/kubernetes/pkg/apis/settings/install"
 	_ "k8s.io/kubernetes/pkg/apis/storage/install"
 
-	_ "github.com/openshift/origin/pkg/apps/apis/apps/install"
-	_ "github.com/openshift/origin/pkg/authorization/apis/authorization/install"
-	_ "github.com/openshift/origin/pkg/build/apis/build/install"
 	_ "github.com/openshift/origin/pkg/cmd/server/api/install"
-	_ "github.com/openshift/origin/pkg/image/apis/image/install"
-	_ "github.com/openshift/origin/pkg/network/apis/network/install"
-	_ "github.com/openshift/origin/pkg/oauth/apis/oauth/install"
-	_ "github.com/openshift/origin/pkg/project/apis/project/install"
-	_ "github.com/openshift/origin/pkg/quota/apis/quota/install"
-	_ "github.com/openshift/origin/pkg/route/apis/route/install"
-	_ "github.com/openshift/origin/pkg/security/apis/security/install"
-	_ "github.com/openshift/origin/pkg/template/apis/template/install"
-	_ "github.com/openshift/origin/pkg/user/apis/user/install"
+
+	apps "github.com/openshift/origin/pkg/apps/apis/apps/install"
+	authz "github.com/openshift/origin/pkg/authorization/apis/authorization/install"
+	build "github.com/openshift/origin/pkg/build/apis/build/install"
+	image "github.com/openshift/origin/pkg/image/apis/image/install"
+	network "github.com/openshift/origin/pkg/network/apis/network/install"
+	oauth "github.com/openshift/origin/pkg/oauth/apis/oauth/install"
+	project "github.com/openshift/origin/pkg/project/apis/project/install"
+	quota "github.com/openshift/origin/pkg/quota/apis/quota/install"
+	route "github.com/openshift/origin/pkg/route/apis/route/install"
+	security "github.com/openshift/origin/pkg/security/apis/security/install"
+	template "github.com/openshift/origin/pkg/template/apis/template/install"
+	user "github.com/openshift/origin/pkg/user/apis/user/install"
 
 	metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -592,3 +594,19 @@ func init() {
 		return false, nil
 	})
 }
+
+func InstallAll() {
+	// add Origin types to the kubectl scheme
+	apps.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+	authz.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+	build.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+	image.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+	network.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+	oauth.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+	project.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+	quota.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+	route.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+	security.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+	template.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+	user.Install(scheme.GroupFactoryRegistry, scheme.Registry, scheme.Scheme)
+}