Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
190ca2eb
Commit
190ca2eb
authored
Sep 10, 2015
by
Chao Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add import_known_versions.go
parent
64bf839e
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
24 additions
and
6 deletions
+24
-6
install.go
pkg/api/install/install.go
+3
-1
registered.go
pkg/api/registered/registered.go
+3
-1
client.go
pkg/client/unversioned/client.go
+3
-0
helper.go
pkg/client/unversioned/helper.go
+2
-0
import_known_versions.go
pkg/client/unversioned/import_known_versions.go
+6
-0
install.go
pkg/expapi/install/install.go
+1
-1
import_known_versions.go
pkg/master/import_known_versions.go
+6
-0
master.go
pkg/master/master.go
+0
-3
No files found.
pkg/api/install/install.go
View file @
190ca2eb
...
@@ -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
),
...
...
pkg/api/registered/registered.go
View file @
190ca2eb
...
@@ -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.
...
...
pkg/client/unversioned/client.go
View file @
190ca2eb
...
@@ -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"
)
)
...
...
pkg/client/unversioned/helper.go
View file @
190ca2eb
...
@@ -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
,
", "
))
...
...
pkg/client/unversioned/import_known_versions.go
0 → 100644
View file @
190ca2eb
package
unversioned
import
(
_
"k8s.io/kubernetes/pkg/api/install"
_
"k8s.io/kubernetes/pkg/expapi/install"
)
pkg/expapi/install/install.go
View file @
190ca2eb
...
@@ -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
),
...
...
pkg/master/import_known_versions.go
0 → 100644
View file @
190ca2eb
package
master
import
(
_
"k8s.io/kubernetes/pkg/api/install"
_
"k8s.io/kubernetes/pkg/expapi/install"
)
pkg/master/master.go
View file @
190ca2eb
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment