straight move of openshift apiserver

Author: deads2k

pkg/cmd/server/origin/legacy.go renamed to pkg/cmd/openshift-apiserver/openshiftapiserver/legacy.go

@@ -1,4 +1,4 @@
-package origin
+package openshiftapiserver
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"

pkg/cmd/server/origin/openshift_apiserver.go renamed to pkg/cmd/openshift-apiserver/openshiftapiserver/openshift_apiserver.go

@@ -1,4 +1,4 @@
-package origin
+package openshiftapiserver
 
 import (
 	"encoding/json"
@@ -572,7 +572,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
 	addReadinessCheckRoute(s.GenericAPIServer.Handler.NonGoRestfulMux, "/healthz/ready", c.ExtraConfig.ProjectAuthorizationCache.ReadyForAccess)
 
 	// this remains here and separate so that you can check both kube and openshift levels
-	addOpenshiftVersionRoute(s.GenericAPIServer.Handler.GoRestfulContainer, "/version/openshift")
+	AddOpenshiftVersionRoute(s.GenericAPIServer.Handler.GoRestfulContainer, "/version/openshift")
 
 	// register our poststarthooks
 	s.GenericAPIServer.AddPostStartHookOrDie("project.openshift.io-projectcache", c.startProjectCache)
@@ -616,7 +616,7 @@ func addReadinessCheckRoute(mux *genericmux.PathRecorderMux, path string, readyF
 }
 
 // initVersionRoute initializes an HTTP endpoint for the server's version information.
-func addOpenshiftVersionRoute(container *restful.Container, path string) {
+func AddOpenshiftVersionRoute(container *restful.Container, path string) {
 	// Build version info once
 	versionInfo, err := json.MarshalIndent(version.Get(), "", "  ")
 	if err != nil {
@@ -691,8 +691,8 @@ func (c *completedConfig) bootstrapSCC(context genericapiserver.PostStartHookCon
 	return nil
 }
 
-// ensureOpenShiftInfraNamespace is called as part of global policy initialization to ensure infra namespace exists
-func ensureOpenShiftInfraNamespace(context genericapiserver.PostStartHookContext) error {
+// EnsureOpenShiftInfraNamespace is called as part of global policy initialization to ensure infra namespace exists
+func EnsureOpenShiftInfraNamespace(context genericapiserver.PostStartHookContext) error {
 	namespaceName := bootstrappolicy.DefaultOpenShiftInfraNamespace
 
 	var coreClient coreclient.CoreInterface

pkg/cmd/server/origin/master.go

@@ -17,6 +17,7 @@ import (
 	kcorestorage "k8s.io/kubernetes/pkg/registry/core/rest"
 	rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest"
 
+	"github.com/openshift/origin/pkg/cmd/openshift-apiserver/openshiftapiserver"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	kubernetes "github.com/openshift/origin/pkg/cmd/server/kubernetes/master"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
@@ -35,7 +36,7 @@ const (
 	openShiftOAuthCallbackPrefix = "/oauth2callback"
 )
 
-func (c *MasterConfig) newOpenshiftAPIConfig(kubeAPIServerConfig apiserver.Config) (*OpenshiftAPIConfig, error) {
+func (c *MasterConfig) newOpenshiftAPIConfig(kubeAPIServerConfig apiserver.Config) (*openshiftapiserver.OpenshiftAPIConfig, error) {
 	// sccStorage must use the upstream RESTOptionsGetter to be in the correct location
 	// this probably creates a duplicate cache, but there are not very many SCCs, so live with it to avoid further linkage
 	sccStorage := sccstorage.NewREST(kubeAPIServerConfig.RESTOptionsGetter)
@@ -56,9 +57,9 @@ func (c *MasterConfig) newOpenshiftAPIConfig(kubeAPIServerConfig apiserver.Confi
 		}
 	}
 
-	ret := &OpenshiftAPIConfig{
+	ret := &openshiftapiserver.OpenshiftAPIConfig{
 		GenericConfig: &apiserver.RecommendedConfig{Config: genericConfig},
-		ExtraConfig: OpenshiftAPIExtraConfig{
+		ExtraConfig: openshiftapiserver.OpenshiftAPIExtraConfig{
 			KubeAPIServerClientConfig:          &c.PrivilegedLoopbackClientConfig,
 			KubeInternalInformers:              c.InternalKubeInformers,
 			KubeInformers:                      c.ClientGoKubeInformers,
@@ -160,7 +161,7 @@ func (c *MasterConfig) withKubeAPI(delegateAPIServer apiserver.DelegationTarget,
 
 	// this remains here and separate so that you can check both kube and openshift levels
 	// TODO make this is a proxy at some point
-	addOpenshiftVersionRoute(kubeAPIServer.GenericAPIServer.Handler.GoRestfulContainer, "/version/openshift")
+	openshiftapiserver.AddOpenshiftVersionRoute(kubeAPIServer.GenericAPIServer.Handler.GoRestfulContainer, "/version/openshift")
 
 	return preparedKubeAPIServer.GenericAPIServer, nil
 }
@@ -278,7 +279,7 @@ func (c *MasterConfig) Run(stopCh <-chan struct{}) error {
 
 	// add post-start hooks
 	aggregatedAPIServer.GenericAPIServer.AddPostStartHookOrDie("authorization.openshift.io-bootstrapclusterroles", bootstrapData(bootstrappolicy.Policy()).EnsureRBACPolicy())
-	aggregatedAPIServer.GenericAPIServer.AddPostStartHookOrDie("authorization.openshift.io-ensureopenshift-infra", ensureOpenShiftInfraNamespace)
+	aggregatedAPIServer.GenericAPIServer.AddPostStartHookOrDie("authorization.openshift.io-ensureopenshift-infra", openshiftapiserver.EnsureOpenShiftInfraNamespace)
 	c.AddPostStartHooks(aggregatedAPIServer.GenericAPIServer)
 
 	for name, fn := range c.additionalPostStartHooks {
@@ -337,7 +338,7 @@ func (c *MasterConfig) RunKubeAPIServer(stopCh <-chan struct{}) error {
 	}
 
 	aggregatedAPIServer.GenericAPIServer.AddPostStartHookOrDie("authorization.openshift.io-bootstrapclusterroles", bootstrapData(bootstrappolicy.Policy()).EnsureRBACPolicy())
-	aggregatedAPIServer.GenericAPIServer.AddPostStartHookOrDie("authorization.openshift.io-ensureopenshift-infra", ensureOpenShiftInfraNamespace)
+	aggregatedAPIServer.GenericAPIServer.AddPostStartHookOrDie("authorization.openshift.io-ensureopenshift-infra", openshiftapiserver.EnsureOpenShiftInfraNamespace)
 	c.AddPostStartHooks(aggregatedAPIServer.GenericAPIServer)
 
 	// add post-start hooks