Integration test on master, not just apiserver.

Moved code from cmd/apiserver to pkg/master.

test/integration/client_test made to use a master object,
instead of an apiserver.Handle.

Subsequent PRs will move more handler-installation into
pkg/master, with the goal that every http.Handler of a
standalone apiserver process can also be tested
in a "testing"-style go test.

In particular, a subsequent PR will test
authorization.

pkg/apiserver/apiserver.go

@@ -30,7 +30,7 @@ import (
 )
 
 // mux is an object that can register http handlers.
-type mux interface {
+type Mux interface {
 	Handle(pattern string, handler http.Handler)
 	HandleFunc(pattern string, handler func(http.ResponseWriter, *http.Request))
 }
@@ -87,7 +87,7 @@ func NewAPIGroup(storage map[string]RESTStorage, codec runtime.Codec, canonicalP
 // InstallREST registers the REST handlers (storage, watch, and operations) into a mux.
 // It is expected that the provided prefix will serve all operations. Path MUST NOT end
 // in a slash.
-func (g *APIGroup) InstallREST(mux mux, paths ...string) {
+func (g *APIGroup) InstallREST(mux Mux, paths ...string) {
 	restHandler := &g.handler
 	watchHandler := &WatchHandler{g.handler.storage, g.handler.codec}
 	redirectHandler := &RedirectHandler{g.handler.storage, g.handler.codec}
@@ -119,14 +119,14 @@ func (g *APIGroup) InstallREST(mux mux, paths ...string) {
 }
 
 // InstallSupport registers the APIServer support functions into a mux.
-func InstallSupport(mux mux) {
+func InstallSupport(mux Mux) {
 	healthz.InstallHandler(mux)
 	mux.HandleFunc("/version", handleVersion)
 	mux.HandleFunc("/", handleIndex)
 }
 
 // InstallLogsSupport registers the APIServer log support function into a mux.
-func InstallLogsSupport(mux mux) {
+func InstallLogsSupport(mux Mux) {
 	mux.Handle("/logs/", http.StripPrefix("/logs/", http.FileServer(http.Dir("/var/log/"))))
 }
 

pkg/master/master.go

@@ -39,6 +39,7 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/ui"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 )
 
@@ -55,6 +56,10 @@ type Config struct {
 	KubeletClient      client.KubeletClient
 	NodeResources      api.NodeResources
 	PortalNet          *net.IPNet
+	Mux                apiserver.Mux
+	EnableLogsSupport  bool
+	EnableUISupport    bool
+	APIPrefix          string
 }
 
 // Master contains state for a Kubernetes cluster master/api server.
@@ -69,6 +74,10 @@ type Master struct {
 	storage            map[string]apiserver.RESTStorage
 	client             *client.Client
 	portalNet          *net.IPNet
+	mux                apiserver.Mux
+	enableLogsSupport  bool
+	enableUISupport    bool
+	apiPrefix          string
 }
 
 // NewEtcdHelper returns an EtcdHelper for the provided arguments or an error if the version
@@ -101,6 +110,10 @@ func New(c *Config) *Master {
 		minionRegistry:     minionRegistry,
 		client:             c.Client,
 		portalNet:          c.PortalNet,
+		mux:                c.Mux,
+		enableLogsSupport:  c.EnableLogsSupport,
+		enableUISupport:    c.EnableUISupport,
+		apiPrefix:          c.APIPrefix,
 	}
 	m.init(c)
 	return m
@@ -148,6 +161,15 @@ func (m *Master) init(c *Config) {
 		// TODO: should appear only in scheduler API group.
 		"bindings": binding.NewREST(m.bindingRegistry),
 	}
+	apiserver.NewAPIGroup(m.API_v1beta1()).InstallREST(m.mux, c.APIPrefix+"/v1beta1")
+	apiserver.NewAPIGroup(m.API_v1beta2()).InstallREST(m.mux, c.APIPrefix+"/v1beta2")
+	apiserver.InstallSupport(m.mux)
+	if c.EnableLogsSupport {
+		apiserver.InstallLogsSupport(m.mux)
+	}
+	if c.EnableUISupport {
+		ui.InstallSupport(m.mux)
+	}
 }
 
 // API_v1beta1 returns the resources and codec for API version v1beta1.