Commit 190ca2eb authored by Chao Xu's avatar Chao Xu

add import_known_versions.go

parent 64bf839e
...@@ -18,6 +18,7 @@ package install ...@@ -18,6 +18,7 @@ package install
import ( import (
"fmt" "fmt"
"runtime/debug"
"strings" "strings"
"k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/latest"
...@@ -39,6 +40,7 @@ const importPrefix = "k8s.io/kubernetes/pkg/api" ...@@ -39,6 +40,7 @@ const importPrefix = "k8s.io/kubernetes/pkg/api"
var accessor = meta.NewAccessor() var accessor = meta.NewAccessor()
func init() { func init() {
debug.PrintStack()
groupMeta, err := latest.RegisterGroup("") groupMeta, err := latest.RegisterGroup("")
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
...@@ -47,7 +49,7 @@ func init() { ...@@ -47,7 +49,7 @@ func init() {
// Use the first API version in the list of registered versions as the latest. // Use the first API version in the list of registered versions as the latest.
registeredGroupVersions := registered.GroupVersionsForGroup("") registeredGroupVersions := registered.GroupVersionsForGroup("")
groupVersion := registeredGroupVersions[0] groupVersion := registeredGroupVersions[0]
groupMeta = &latest.GroupMeta{ *groupMeta = latest.GroupMeta{
GroupVersion: groupVersion, GroupVersion: groupVersion,
Group: apiutil.GetGroup(groupVersion), Group: apiutil.GetGroup(groupVersion),
Version: apiutil.GetVersion(groupVersion), Version: apiutil.GetVersion(groupVersion),
......
...@@ -30,8 +30,10 @@ import ( ...@@ -30,8 +30,10 @@ import (
var RegisteredVersions []string var RegisteredVersions []string
func init() { func init() {
// TODO: caesarxuchao: rename this variable to validGroupVersions
validAPIVersions := map[string]bool{ validAPIVersions := map[string]bool{
"v1": true, "v1": true,
"experimental/v1": true,
} }
// The default list of supported api versions, in order of most preferred to the least. // The default list of supported api versions, in order of most preferred to the least.
......
...@@ -23,6 +23,9 @@ import ( ...@@ -23,6 +23,9 @@ import (
"net/url" "net/url"
"strings" "strings"
// _ "k8s.io/kubernetes/pkg/api/install"
// _ "k8s.io/kubernetes/pkg/expapi/install"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/version"
) )
......
...@@ -290,6 +290,8 @@ func SetKubernetesDefaults(config *Config) error { ...@@ -290,6 +290,8 @@ func SetKubernetesDefaults(config *Config) error {
config.Version = defaultVersionFor(config) config.Version = defaultVersionFor(config)
} }
version := config.Version version := config.Version
fmt.Println("CHAO:")
fmt.Println(latest.GroupOrDie(""))
versionInterfaces, err := latest.GroupOrDie("").InterfacesFor(version) versionInterfaces, err := latest.GroupOrDie("").InterfacesFor(version)
if err != nil { if err != nil {
return fmt.Errorf("API version '%s' is not recognized (valid values: %s)", version, strings.Join(latest.GroupOrDie("").Versions, ", ")) return fmt.Errorf("API version '%s' is not recognized (valid values: %s)", version, strings.Join(latest.GroupOrDie("").Versions, ", "))
......
package unversioned
import (
_ "k8s.io/kubernetes/pkg/api/install"
_ "k8s.io/kubernetes/pkg/expapi/install"
)
...@@ -43,7 +43,7 @@ func init() { ...@@ -43,7 +43,7 @@ func init() {
} }
registeredGroupVersions := registered.GroupVersionsForGroup("experimental") registeredGroupVersions := registered.GroupVersionsForGroup("experimental")
groupVersion := registeredGroupVersions[0] groupVersion := registeredGroupVersions[0]
groupMeta = &latest.GroupMeta{ *groupMeta = latest.GroupMeta{
GroupVersion: groupVersion, GroupVersion: groupVersion,
Group: apiutil.GetGroup(groupVersion), Group: apiutil.GetGroup(groupVersion),
Version: apiutil.GetVersion(groupVersion), Version: apiutil.GetVersion(groupVersion),
......
package master
import (
_ "k8s.io/kubernetes/pkg/api/install"
_ "k8s.io/kubernetes/pkg/expapi/install"
)
...@@ -31,9 +31,6 @@ import ( ...@@ -31,9 +31,6 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
_ "k8s.io/kubernetes/pkg/api/install"
_ "k8s.io/kubernetes/pkg/expapi/install"
"k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/admission"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/latest"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment