github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

remove Versions from GroupMeta

Browse Source
This commit is contained in:
deads2k 2015-12-02 15:47:42 -05:00
parent 643cb7a1c7
commit 675d8a235e
10 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/install/install.go
View File

@ -20,7 +20,6 @@ package install
import ( import (
"fmt" "fmt"
"strings"
"github.com/golang/glog" "github.com/golang/glog"
@ -57,13 +56,10 @@ func init() {
Codec: runtime.CodecFor(api.Scheme, groupVersion.String()), Codec: runtime.CodecFor(api.Scheme, groupVersion.String()),
} }
var versions []string
worstToBestGroupVersions := []unversioned.GroupVersion{} worstToBestGroupVersions := []unversioned.GroupVersion{}
for i := len(registeredGroupVersions) - 1; i >= 0; i-- { for i := len(registeredGroupVersions) - 1; i >= 0; i-- {
versions = append(versions, registeredGroupVersions[i].Version)
worstToBestGroupVersions = append(worstToBestGroupVersions, registeredGroupVersions[i]) worstToBestGroupVersions = append(worstToBestGroupVersions, registeredGroupVersions[i])
} }
groupMeta.Versions = versions
groupMeta.GroupVersions = registeredGroupVersions groupMeta.GroupVersions = registeredGroupVersions
groupMeta.SelfLinker = runtime.SelfLinker(accessor) groupMeta.SelfLinker = runtime.SelfLinker(accessor)
@ -111,7 +107,7 @@ func interfacesFor(version string) (*meta.VersionInterfaces, error) {
default: default:
{ {
g, _ := latest.Group("") g, _ := latest.Group("")
return nil, fmt.Errorf("unsupported storage version: %s (valid: %s)", version, strings.Join(g.Versions, ", ")) return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions)
} }
} }
} }

14
pkg/api/install/install_test.go
View File

@ -66,8 +66,8 @@ func TestInterfacesFor(t *testing.T) {
if _, err := latest.GroupOrDie("").InterfacesFor(""); err == nil { if _, err := latest.GroupOrDie("").InterfacesFor(""); err == nil {
t.Fatalf("unexpected non-error: %v", err) t.Fatalf("unexpected non-error: %v", err)
} }
for i, version := range append([]string{latest.GroupOrDie("").GroupVersion.Version}, latest.GroupOrDie("").Versions...) { for i, version := range latest.GroupOrDie("").GroupVersions {
if vi, err := latest.GroupOrDie("").InterfacesFor(version); err != nil || vi == nil { if vi, err := latest.GroupOrDie("").InterfacesFor(version.Version); err != nil || vi == nil {
t.Fatalf("%d: unexpected result: %v", i, err) t.Fatalf("%d: unexpected result: %v", i, err)
} }
} }
@ -86,10 +86,8 @@ func TestRESTMapper(t *testing.T) {
t.Errorf("unexpected version mapping: %#v %v", m, err) t.Errorf("unexpected version mapping: %#v %v", m, err)
} }
for _, version := range latest.GroupOrDie("").Versions { for _, version := range latest.GroupOrDie("").GroupVersions {
currGroupVersion := unversioned.GroupVersion{Version: version} mapping, err := latest.GroupOrDie("").RESTMapper.RESTMapping(rcGVK.GroupKind(), version.Version)
mapping, err := latest.GroupOrDie("").RESTMapper.RESTMapping(rcGVK.GroupKind(), currGroupVersion.String())
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -97,11 +95,11 @@ func TestRESTMapper(t *testing.T) {
if mapping.Resource != "replicationControllers" && mapping.Resource != "replicationcontrollers" { if mapping.Resource != "replicationControllers" && mapping.Resource != "replicationcontrollers" {
t.Errorf("incorrect resource name: %#v", mapping) t.Errorf("incorrect resource name: %#v", mapping)
} }
if mapping.GroupVersionKind.GroupVersion() != currGroupVersion { if mapping.GroupVersionKind.GroupVersion() != version {
t.Errorf("incorrect version: %v", mapping) t.Errorf("incorrect version: %v", mapping)
} }
interfaces, _ := latest.GroupOrDie("").InterfacesFor(currGroupVersion.String()) interfaces, _ := latest.GroupOrDie("").InterfacesFor(version.String())
if mapping.Codec != interfaces.Codec { if mapping.Codec != interfaces.Codec {
t.Errorf("unexpected codec: %#v, expected: %#v", mapping, interfaces) t.Errorf("unexpected codec: %#v, expected: %#v", mapping, interfaces)
} }

7
pkg/api/latest/latest.go
View File

@ -109,13 +109,6 @@ type GroupMeta struct {
// GroupVersion represents the current external default version of the group. // GroupVersion represents the current external default version of the group.
GroupVersion unversioned.GroupVersion GroupVersion unversioned.GroupVersion
// Versions is the list of versions that are recognized in code. The order
// provided is assumed to be from the oldest to the newest, e.g.,
// Versions[0] == oldest and Versions[N-1] == newest.
// Clients may choose to prefer the latter items in the list over the former
// items when presented with a set of versions to choose.
Versions []string
// GroupVersions is Group + Versions. This is to avoid string concatenation // GroupVersions is Group + Versions. This is to avoid string concatenation
// in many places. // in many places.
GroupVersions []unversioned.GroupVersion GroupVersions []unversioned.GroupVersion

6
pkg/apis/componentconfig/install/install.go
View File

@ -20,7 +20,6 @@ package install
import ( import (
"fmt" "fmt"
"strings"
"github.com/golang/glog" "github.com/golang/glog"
@ -53,13 +52,10 @@ func init() {
Codec: runtime.CodecFor(api.Scheme, groupVersion.String()), Codec: runtime.CodecFor(api.Scheme, groupVersion.String()),
} }
var versions []string
worstToBestGroupVersions := []unversioned.GroupVersion{} worstToBestGroupVersions := []unversioned.GroupVersion{}
for i := len(registeredGroupVersions) - 1; i >= 0; i-- { for i := len(registeredGroupVersions) - 1; i >= 0; i-- {
versions = append(versions, registeredGroupVersions[i].Version)
worstToBestGroupVersions = append(worstToBestGroupVersions, registeredGroupVersions[i]) worstToBestGroupVersions = append(worstToBestGroupVersions, registeredGroupVersions[i])
} }
groupMeta.Versions = versions
groupMeta.GroupVersions = registeredGroupVersions groupMeta.GroupVersions = registeredGroupVersions
groupMeta.SelfLinker = runtime.SelfLinker(accessor) groupMeta.SelfLinker = runtime.SelfLinker(accessor)
@ -87,6 +83,6 @@ func interfacesFor(version string) (*meta.VersionInterfaces, error) {
}, nil }, nil
default: default:
g, _ := latest.Group("componentconfig") g, _ := latest.Group("componentconfig")
return nil, fmt.Errorf("unsupported storage version: %s (valid: %s)", version, strings.Join(g.Versions, ", ")) return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions)
} }
} }

4
pkg/apis/componentconfig/install/install_test.go
View File

@ -65,8 +65,8 @@ func TestRESTMapper(t *testing.T) {
t.Errorf("unexpected version mapping: %#v %v", m, err) t.Errorf("unexpected version mapping: %#v %v", m, err)
} }
for _, version := range latest.GroupOrDie("componentconfig").Versions { for _, version := range latest.GroupOrDie("componentconfig").GroupVersions {
mapping, err := latest.GroupOrDie("componentconfig").RESTMapper.RESTMapping(proxyGVK.GroupKind(), version) mapping, err := latest.GroupOrDie("componentconfig").RESTMapper.RESTMapping(proxyGVK.GroupKind(), version.Version)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
continue continue

6
pkg/apis/extensions/install/install.go
View File

@ -20,7 +20,6 @@ package install
import ( import (
"fmt" "fmt"
"strings"
"github.com/golang/glog" "github.com/golang/glog"
@ -53,13 +52,10 @@ func init() {
Codec: runtime.CodecFor(api.Scheme, groupVersion.String()), Codec: runtime.CodecFor(api.Scheme, groupVersion.String()),
} }
var versions []string
worstToBestGroupVersions := []unversioned.GroupVersion{} worstToBestGroupVersions := []unversioned.GroupVersion{}
for i := len(registeredGroupVersions) - 1; i >= 0; i-- { for i := len(registeredGroupVersions) - 1; i >= 0; i-- {
versions = append(versions, registeredGroupVersions[i].Version)
worstToBestGroupVersions = append(worstToBestGroupVersions, registeredGroupVersions[i]) worstToBestGroupVersions = append(worstToBestGroupVersions, registeredGroupVersions[i])
} }
groupMeta.Versions = versions
groupMeta.GroupVersions = registeredGroupVersions groupMeta.GroupVersions = registeredGroupVersions
groupMeta.SelfLinker = runtime.SelfLinker(accessor) groupMeta.SelfLinker = runtime.SelfLinker(accessor)
@ -87,6 +83,6 @@ func interfacesFor(version string) (*meta.VersionInterfaces, error) {
}, nil }, nil
default: default:
g, _ := latest.Group("extensions") g, _ := latest.Group("extensions")
return nil, fmt.Errorf("unsupported storage version: %s (valid: %s)", version, strings.Join(g.Versions, ", ")) return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions)
} }
} }

4
pkg/apis/extensions/install/install_test.go
View File

@ -87,8 +87,8 @@ func TestRESTMapper(t *testing.T) {
t.Errorf("unexpected version mapping: %#v %v", m, err) t.Errorf("unexpected version mapping: %#v %v", m, err)
} }
for _, version := range latest.GroupOrDie("extensions").Versions { for _, version := range latest.GroupOrDie("extensions").GroupVersions {
mapping, err := latest.GroupOrDie("extensions").RESTMapper.RESTMapping(hpaGVK.GroupKind(), version) mapping, err := latest.GroupOrDie("extensions").RESTMapper.RESTMapping(hpaGVK.GroupKind(), version.Version)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }

6
pkg/apis/metrics/install/install.go
View File

@ -20,7 +20,6 @@ package install
import ( import (
"fmt" "fmt"
"strings"
"github.com/golang/glog" "github.com/golang/glog"
@ -53,13 +52,10 @@ func init() {
Codec: runtime.CodecFor(api.Scheme, groupVersion.String()), Codec: runtime.CodecFor(api.Scheme, groupVersion.String()),
} }
var versions []string
worstToBestGroupVersions := []unversioned.GroupVersion{} worstToBestGroupVersions := []unversioned.GroupVersion{}
for i := len(registeredGroupVersions) - 1; i >= 0; i-- { for i := len(registeredGroupVersions) - 1; i >= 0; i-- {
versions = append(versions, registeredGroupVersions[i].Version)
worstToBestGroupVersions = append(worstToBestGroupVersions, registeredGroupVersions[i]) worstToBestGroupVersions = append(worstToBestGroupVersions, registeredGroupVersions[i])
} }
groupMeta.Versions = versions
groupMeta.GroupVersions = registeredGroupVersions groupMeta.GroupVersions = registeredGroupVersions
groupMeta.SelfLinker = runtime.SelfLinker(accessor) groupMeta.SelfLinker = runtime.SelfLinker(accessor)
@ -87,6 +83,6 @@ func interfacesFor(version string) (*meta.VersionInterfaces, error) {
}, nil }, nil
default: default:
g, _ := latest.Group("metrics") g, _ := latest.Group("metrics")
return nil, fmt.Errorf("unsupported storage version: %s (valid: %s)", version, strings.Join(g.Versions, ", ")) return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions)
} }
} }

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

@ -19,7 +19,6 @@ package unversioned
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"strings"
"k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
@ -146,8 +145,8 @@ func setExtensionsDefaults(config *Config) error {
versionInterfaces, err := g.InterfacesFor(config.GroupVersion.String()) versionInterfaces, err := g.InterfacesFor(config.GroupVersion.String())
if err != nil { if err != nil {
return fmt.Errorf("Extensions API group/version '%v' is not recognized (valid values: %s)", return fmt.Errorf("Extensions API group/version '%v' is not recognized (valid values: %v)",
config.GroupVersion, strings.Join(latest.GroupOrDie("extensions").Versions, ", ")) config.GroupVersion, g.GroupVersions)
} }
config.Codec = versionInterfaces.Codec config.Codec = versionInterfaces.Codec
if config.QPS == 0 { if config.QPS == 0 {

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

@ -385,7 +385,7 @@ func SetKubernetesDefaults(config *Config) error {
} }
versionInterfaces, err := latest.GroupOrDie("").InterfacesFor(config.GroupVersion.String()) versionInterfaces, err := latest.GroupOrDie("").InterfacesFor(config.GroupVersion.String())
if err != nil { if err != nil {
return fmt.Errorf("API version '%v' is not recognized (valid values: %s)", *config.GroupVersion, strings.Join(latest.GroupOrDie("").Versions, ", ")) return fmt.Errorf("API version '%v' is not recognized (valid values: %v)", *config.GroupVersion, latest.GroupOrDie("").GroupVersions)
} }
if config.Codec == nil { if config.Codec == nil {
config.Codec = versionInterfaces.Codec config.Codec = versionInterfaces.Codec