fix groups exposes at apis/

api/swagger-spec/resourceListing.json

@@ -3,7 +3,7 @@
   "apis": [
    {
     "path": "/api/v1",
-    "description": "API at /api/v1 version v1"
+    "description": "API at /api/v1"
    },
    {
     "path": "/api",

pkg/apiserver/api_installer.go

@@ -90,7 +90,8 @@ func (a *APIInstaller) Install(ws *restful.WebService) (apiResources []api.APIRe
 func (a *APIInstaller) NewWebService() *restful.WebService {
 	ws := new(restful.WebService)
 	ws.Path(a.prefix)
-	ws.Doc("API at " + a.prefix + " version " + a.group.Version)
+	// a.prefix contains "prefix/group/version"
+	ws.Doc("API at " + a.prefix)
 	// TODO: change to restful.MIME_JSON when we set content type in client
 	ws.Consumes("*/*")
 	ws.Produces(restful.MIME_JSON)

pkg/apiserver/apiserver.go

@@ -78,13 +78,16 @@ type Mux interface {
 type APIGroupVersion struct {
 	Storage map[string]rest.Storage
 
-	Root    string
+	Root string
+	// TODO: caesarxuchao: Version actually contains "group/version", refactor it to avoid confusion.
 	Version string
 
 	// ServerVersion controls the Kubernetes APIVersion used for common objects in the apiserver
 	// schema like api.Status, api.DeleteOptions, and api.ListOptions. Other implementors may
 	// define a version "v1beta1" but want to use the Kubernetes "v1" internal objects. If
 	// empty, defaults to Version.
+	// TODO: caesarxuchao: ServerVersion actually contains "group/version",
+	// refactor it to avoid confusion.
 	ServerVersion string
 
 	Mapper meta.RESTMapper

pkg/master/master.go

@@ -36,6 +36,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/latest"
 	"k8s.io/kubernetes/pkg/api/meta"
 	"k8s.io/kubernetes/pkg/api/rest"
+	apiutil "k8s.io/kubernetes/pkg/api/util"
 	"k8s.io/kubernetes/pkg/api/v1"
 	expapi "k8s.io/kubernetes/pkg/apis/experimental"
 	"k8s.io/kubernetes/pkg/apiserver"
@@ -593,8 +594,8 @@ func (m *Master) init(c *Config) {
 		}
 		expAPIVersions := []api.GroupVersion{
 			{
-				GroupVersion: g.Group + "/" + expVersion.Version,
-				Version:      expVersion.Version,
+				GroupVersion: expVersion.Version,
+				Version:      apiutil.GetVersion(expVersion.Version),
 			},
 		}
 		storageVersion, found := c.StorageVersions[g.Group]
@@ -604,7 +605,7 @@ func (m *Master) init(c *Config) {
 		group := api.APIGroup{
 			Name:             g.Group,
 			Versions:         expAPIVersions,
-			PreferredVersion: api.GroupVersion{GroupVersion: g.Group + "/" + storageVersion, Version: storageVersion},
+			PreferredVersion: api.GroupVersion{GroupVersion: storageVersion, Version: apiutil.GetVersion(storageVersion)},
 		}
 		apiserver.AddGroupWebService(m.handlerContainer, c.APIGroupPrefix+"/"+latest.GroupOrDie("experimental").Group+"/", group)
 		allGroups = append(allGroups, group)

pkg/master/master_test.go

@@ -37,6 +37,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/meta"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/unversioned"
+	apiutil "k8s.io/kubernetes/pkg/api/util"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/apis/experimental"
 	"k8s.io/kubernetes/pkg/apiserver"
@@ -67,7 +68,7 @@ func setUp(t *testing.T) (Master, Config, *assert.Assertions) {
 	config.DatabaseStorage = etcdstorage.NewEtcdStorage(fakeClient, testapi.Default.Codec(), etcdtest.PathPrefix())
 	storageVersions[""] = testapi.Default.Version()
 	config.ExpDatabaseStorage = etcdstorage.NewEtcdStorage(fakeClient, testapi.Experimental.Codec(), etcdtest.PathPrefix())
-	storageVersions["experimental"] = testapi.Experimental.Version()
+	storageVersions["experimental"] = testapi.Experimental.GroupAndVersion()
 	config.StorageVersions = storageVersions
 	master.nodeRegistry = registrytest.NewNodeRegistry([]string{"node1", "node2"}, api.NodeResources{})
 
@@ -430,6 +431,60 @@ func TestGenerateSSHKey(t *testing.T) {
 	// TODO: testing error cases where the file can not be removed?
 }
 
+func TestDiscoveryAtAPIS(t *testing.T) {
+	master, config, assert := setUp(t)
+	master.exp = true
+	// ================= preparation for master.init() ======================
+	portRange := util.PortRange{Base: 10, Size: 10}
+	master.serviceNodePortRange = portRange
+
+	_, ipnet, err := net.ParseCIDR("192.168.1.1/24")
+	if !assert.NoError(err) {
+		t.Errorf("unexpected error: %v", err)
+	}
+	master.serviceClusterIPRange = ipnet
+
+	mh := apiserver.MuxHelper{Mux: http.NewServeMux()}
+	master.muxHelper = &mh
+	master.rootWebService = new(restful.WebService)
+
+	master.handlerContainer = restful.NewContainer()
+
+	master.mux = http.NewServeMux()
+	master.requestContextMapper = api.NewRequestContextMapper()
+	// ======================= end of preparation ===========================
+
+	master.init(&config)
+	server := httptest.NewServer(master.handlerContainer.ServeMux)
+	resp, err := http.Get(server.URL + "/apis")
+	if !assert.NoError(err) {
+		t.Errorf("unexpected error: %v", err)
+	}
+
+	assert.Equal(http.StatusOK, resp.StatusCode)
+
+	groupList := api.APIGroupList{}
+	assert.NoError(decodeResponse(resp, &groupList))
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	expectGroupName := "experimental"
+	expectVersions := []api.GroupVersion{
+		{
+			GroupVersion: testapi.Experimental.GroupAndVersion(),
+			Version:      testapi.Experimental.Version(),
+		},
+	}
+	expectPreferredVersion := api.GroupVersion{
+		GroupVersion: config.StorageVersions["experimental"],
+		Version:      apiutil.GetVersion(config.StorageVersions["experimental"]),
+	}
+	assert.Equal(expectGroupName, groupList.Groups[0].Name)
+	assert.Equal(expectVersions, groupList.Groups[0].Versions)
+	assert.Equal(expectPreferredVersion, groupList.Groups[0].PreferredVersion)
+}
+
 var versionsToTest = []string{"v1", "v3"}
 
 type Foo struct {