mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 14:37:00 +00:00
add import_known_versions.go
This commit is contained in:
parent
64bf839e9f
commit
190ca2ebf2
@ -18,6 +18,7 @@ package install
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"runtime/debug"
|
||||
"strings"
|
||||
|
||||
"k8s.io/kubernetes/pkg/api/latest"
|
||||
@ -39,6 +40,7 @@ const importPrefix = "k8s.io/kubernetes/pkg/api"
|
||||
var accessor = meta.NewAccessor()
|
||||
|
||||
func init() {
|
||||
debug.PrintStack()
|
||||
groupMeta, err := latest.RegisterGroup("")
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
@ -47,7 +49,7 @@ func init() {
|
||||
// Use the first API version in the list of registered versions as the latest.
|
||||
registeredGroupVersions := registered.GroupVersionsForGroup("")
|
||||
groupVersion := registeredGroupVersions[0]
|
||||
groupMeta = &latest.GroupMeta{
|
||||
*groupMeta = latest.GroupMeta{
|
||||
GroupVersion: groupVersion,
|
||||
Group: apiutil.GetGroup(groupVersion),
|
||||
Version: apiutil.GetVersion(groupVersion),
|
||||
|
@ -30,8 +30,10 @@ import (
|
||||
var RegisteredVersions []string
|
||||
|
||||
func init() {
|
||||
// TODO: caesarxuchao: rename this variable to validGroupVersions
|
||||
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.
|
||||
|
@ -23,6 +23,9 @@ import (
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
// _ "k8s.io/kubernetes/pkg/api/install"
|
||||
// _ "k8s.io/kubernetes/pkg/expapi/install"
|
||||
|
||||
"k8s.io/kubernetes/pkg/api"
|
||||
"k8s.io/kubernetes/pkg/version"
|
||||
)
|
||||
|
@ -290,6 +290,8 @@ func SetKubernetesDefaults(config *Config) error {
|
||||
config.Version = defaultVersionFor(config)
|
||||
}
|
||||
version := config.Version
|
||||
fmt.Println("CHAO:")
|
||||
fmt.Println(latest.GroupOrDie(""))
|
||||
versionInterfaces, err := latest.GroupOrDie("").InterfacesFor(version)
|
||||
if err != nil {
|
||||
return fmt.Errorf("API version '%s' is not recognized (valid values: %s)", version, strings.Join(latest.GroupOrDie("").Versions, ", "))
|
||||
|
6
pkg/client/unversioned/import_known_versions.go
Normal file
6
pkg/client/unversioned/import_known_versions.go
Normal file
@ -0,0 +1,6 @@
|
||||
package unversioned
|
||||
|
||||
import (
|
||||
_ "k8s.io/kubernetes/pkg/api/install"
|
||||
_ "k8s.io/kubernetes/pkg/expapi/install"
|
||||
)
|
@ -43,7 +43,7 @@ func init() {
|
||||
}
|
||||
registeredGroupVersions := registered.GroupVersionsForGroup("experimental")
|
||||
groupVersion := registeredGroupVersions[0]
|
||||
groupMeta = &latest.GroupMeta{
|
||||
*groupMeta = latest.GroupMeta{
|
||||
GroupVersion: groupVersion,
|
||||
Group: apiutil.GetGroup(groupVersion),
|
||||
Version: apiutil.GetVersion(groupVersion),
|
||||
|
6
pkg/master/import_known_versions.go
Normal file
6
pkg/master/import_known_versions.go
Normal file
@ -0,0 +1,6 @@
|
||||
package master
|
||||
|
||||
import (
|
||||
_ "k8s.io/kubernetes/pkg/api/install"
|
||||
_ "k8s.io/kubernetes/pkg/expapi/install"
|
||||
)
|
@ -31,9 +31,6 @@ import (
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
_ "k8s.io/kubernetes/pkg/api/install"
|
||||
_ "k8s.io/kubernetes/pkg/expapi/install"
|
||||
|
||||
"k8s.io/kubernetes/pkg/admission"
|
||||
"k8s.io/kubernetes/pkg/api"
|
||||
"k8s.io/kubernetes/pkg/api/latest"
|
||||
|
Loading…
Reference in New Issue
Block a user