github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19674 from nikhiljindal/latestAndRegistered

Browse Source 
Merge registered and latest and move to apimachinery
This commit is contained in:
Nikhil Jindal
2016-01-21 17:19:49 -08:00
parent 76f02d562a 2ad642d370
commit cd2e0c490e
63 changed files with 378 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/client/typed/generated/extensions/unversioned/extensions_client.go
View File

@@ -18,7 +18,7 @@ package unversioned
import (
"fmt"
latest "k8s.io/kubernetes/pkg/api/latest"
registered "k8s.io/kubernetes/pkg/apimachinery/registered"
unversioned "k8s.io/kubernetes/pkg/client/unversioned"
)
@@ -95,7 +95,7 @@ func New(c *unversioned.RESTClient) *ExtensionsClient {
func setConfigDefaults(config *unversioned.Config) error {
// if extensions group is not registered, return an error
g, err := latest.Group("extensions")
g, err := registered.Group("extensions")
if err != nil {
return err
}

4
pkg/client/typed/generated/legacy/unversioned/legacy_client.go
View File

@@ -18,7 +18,7 @@ package unversioned
import (
"fmt"
latest "k8s.io/kubernetes/pkg/api/latest"
registered "k8s.io/kubernetes/pkg/apimachinery/registered"
unversioned "k8s.io/kubernetes/pkg/client/unversioned"
)
@@ -135,7 +135,7 @@ func New(c *unversioned.RESTClient) *LegacyClient {
func setConfigDefaults(config *unversioned.Config) error {
// if legacy group is not registered, return an error
g, err := latest.Group("")
g, err := registered.Group("")
if err != nil {
return err
}

6
pkg/client/unversioned/extensions.go
View File

@@ -19,7 +19,7 @@ package unversioned
import (
"fmt"
"k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/apimachinery/registered"
"k8s.io/kubernetes/pkg/apis/extensions"
)
@@ -107,7 +107,7 @@ func NewExtensionsOrDie(c *Config) *ExtensionsClient {
func setExtensionsDefaults(config *Config) error {
// if experimental group is not registered, return an error
g, err := latest.Group(extensions.GroupName)
g, err := registered.Group(extensions.GroupName)
if err != nil {
return err
}
@@ -124,7 +124,7 @@ func setExtensionsDefaults(config *Config) error {
versionInterfaces, err := g.InterfacesFor(*config.GroupVersion)
if err != nil {
return fmt.Errorf("Extensions API group/version '%v' is not recognized (valid values: %v)",
config.GroupVersion, latest.GroupOrDie(extensions.GroupName).GroupVersions)
config.GroupVersion, registered.GroupOrDie(extensions.GroupName).GroupVersions)
}
config.Codec = versionInterfaces.Codec
if config.QPS == 0 {

10
pkg/client/unversioned/helper.go
View File

@@ -31,8 +31,8 @@ import (
"github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apimachinery/registered"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
@@ -140,7 +140,7 @@ func New(c *Config) (*Client, error) {
return nil, err
}
if _, err := latest.Group(extensions.GroupName); err != nil {
if _, err := registered.Group(extensions.GroupName); err != nil {
return &Client{RESTClient: client, ExtensionsClient: nil, DiscoveryClient: discoveryClient}, nil
}
experimentalConfig := *c
@@ -371,7 +371,7 @@ func SetKubernetesDefaults(config *Config) error {
if len(config.UserAgent) == 0 {
config.UserAgent = DefaultKubernetesUserAgent()
}
g, err := latest.Group(api.GroupName)
g, err := registered.Group(api.GroupName)
if err != nil {
return err
}
@@ -380,7 +380,7 @@ func SetKubernetesDefaults(config *Config) error {
config.GroupVersion = &copyGroupVersion
versionInterfaces, err := g.InterfacesFor(*config.GroupVersion)
if err != nil {
return fmt.Errorf("API version '%v' is not recognized (valid values: %v)", *config.GroupVersion, latest.GroupOrDie(api.GroupName).GroupVersions)
return fmt.Errorf("API version '%v' is not recognized (valid values: %v)", *config.GroupVersion, registered.GroupOrDie(api.GroupName).GroupVersions)
}
if config.Codec == nil {
config.Codec = versionInterfaces.Codec
@@ -541,7 +541,7 @@ func defaultVersionFor(config *Config) *unversioned.GroupVersion {
// Clients default to the preferred code API version
// TODO: implement version negotiation (highest version supported by server)
// TODO this drops out when groupmeta is refactored
copyGroupVersion := latest.GroupOrDie(api.GroupName).GroupVersion
copyGroupVersion := registered.GroupOrDie(api.GroupName).GroupVersion
return &copyGroupVersion
}

2
pkg/client/unversioned/import_known_versions.go
View File

@@ -21,7 +21,7 @@ import (
"fmt"
_ "k8s.io/kubernetes/pkg/api/install"
"k8s.io/kubernetes/pkg/api/registered"
"k8s.io/kubernetes/pkg/apimachinery/registered"
_ "k8s.io/kubernetes/pkg/apis/authorization/install"
_ "k8s.io/kubernetes/pkg/apis/componentconfig/install"
_ "k8s.io/kubernetes/pkg/apis/extensions/install"