github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

update CodecFor for GroupVersion

Browse Source
This commit is contained in:
deads2k 2015-12-08 13:49:38 -05:00
parent 7de177b8b5
commit 6e33403abf
25 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/libs/go2idl/client-gen/testdata/apis/testgroup/install/install.go vendored
View File

@ -51,7 +51,7 @@ func init() {
groupMeta := latest.GroupMeta{ groupMeta := latest.GroupMeta{
GroupVersion: preferredExternalVersion, GroupVersion: preferredExternalVersion,
GroupVersions: externalVersions, GroupVersions: externalVersions,
Codec: runtime.CodecFor(api.Scheme, preferredExternalVersion.String()), Codec: runtime.CodecFor(api.Scheme, preferredExternalVersion),
RESTMapper: newRESTMapper(externalVersions), RESTMapper: newRESTMapper(externalVersions),
SelfLinker: runtime.SelfLinker(accessor), SelfLinker: runtime.SelfLinker(accessor),
InterfacesFor: interfacesFor, InterfacesFor: interfacesFor,

2
cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1/register.go vendored
View File

@ -24,7 +24,7 @@ import (
var SchemeGroupVersion = unversioned.GroupVersion{Group: "testgroup", Version: "v1"} var SchemeGroupVersion = unversioned.GroupVersion{Group: "testgroup", Version: "v1"}
var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion.String()) var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion)
func init() { func init() {
// Register the API. // Register the API.

2
pkg/api/conversion.go
View File

@ -27,7 +27,7 @@ import (
// Codec is the identity codec for this package - it can only convert itself // Codec is the identity codec for this package - it can only convert itself
// to itself. // to itself.
var Codec = runtime.CodecFor(Scheme, "") var Codec = runtime.CodecFor(Scheme, unversioned.GroupVersion{})
func init() { func init() {
Scheme.AddDefaultingFuncs( Scheme.AddDefaultingFuncs(

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

@ -61,7 +61,7 @@ func init() {
groupMeta := latest.GroupMeta{ groupMeta := latest.GroupMeta{
GroupVersion: preferredExternalVersion, GroupVersion: preferredExternalVersion,
GroupVersions: externalVersions, GroupVersions: externalVersions,
Codec: runtime.CodecFor(api.Scheme, preferredExternalVersion.String()), Codec: runtime.CodecFor(api.Scheme, preferredExternalVersion),
RESTMapper: newRESTMapper(externalVersions), RESTMapper: newRESTMapper(externalVersions),
SelfLinker: runtime.SelfLinker(accessor), SelfLinker: runtime.SelfLinker(accessor),
InterfacesFor: interfacesFor, InterfacesFor: interfacesFor,

3
pkg/api/testing/compat/compatibility_tester.go
View File

@ -27,6 +27,7 @@ import (
"testing" "testing"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/validation/field" "k8s.io/kubernetes/pkg/util/validation/field"
@ -39,7 +40,7 @@ import (
// keys in the resulting JSON. // keys in the resulting JSON.
func TestCompatibility( func TestCompatibility(
t *testing.T, t *testing.T,
version string, version unversioned.GroupVersion,
input []byte, input []byte,
validator func(obj runtime.Object) field.ErrorList, validator func(obj runtime.Object) field.ErrorList,
expectedKeys map[string]string, expectedKeys map[string]string,

3
pkg/api/v1/backward_compatibility_test.go
View File

@ -21,6 +21,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testing/compat" "k8s.io/kubernetes/pkg/api/testing/compat"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/api/validation"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/validation/field" "k8s.io/kubernetes/pkg/util/validation/field"
@ -223,6 +224,6 @@ func TestCompatibility_v1_PodSecurityContext(t *testing.T) {
for _, tc := range cases { for _, tc := range cases {
t.Logf("Testing 1.0.0 backward compatibility for %v", tc.name) t.Logf("Testing 1.0.0 backward compatibility for %v", tc.name)
compat.TestCompatibility(t, "v1", []byte(tc.input), validator, tc.expectedKeys, tc.absentKeys) compat.TestCompatibility(t, v1.SchemeGroupVersion, []byte(tc.input), validator, tc.expectedKeys, tc.absentKeys)
} }
} }

2
pkg/api/v1/register.go
View File

@ -30,7 +30,7 @@ const GroupName = ""
var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1"} var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1"}
// Codec encodes internal objects to the v1 scheme // Codec encodes internal objects to the v1 scheme
var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion.String()) var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion)
func init() { func init() {
// Check if v1 is in the list of supported API versions. // Check if v1 is in the list of supported API versions.

2
pkg/apis/abac/v0/register.go
View File

@ -26,7 +26,7 @@ import (
var GroupVersion = unversioned.GroupVersion{Group: api.Group, Version: "v0"} var GroupVersion = unversioned.GroupVersion{Group: api.Group, Version: "v0"}
// Codec encodes internal objects to the v0 version for the abac group // Codec encodes internal objects to the v0 version for the abac group
var Codec = runtime.CodecFor(api.Scheme, GroupVersion.String()) var Codec = runtime.CodecFor(api.Scheme, GroupVersion)
func init() { func init() {
api.Scheme.AddKnownTypes(GroupVersion, api.Scheme.AddKnownTypes(GroupVersion,

2
pkg/apis/abac/v1beta1/register.go
View File

@ -26,7 +26,7 @@ import (
var GroupVersion = unversioned.GroupVersion{Group: api.Group, Version: "v1beta1"} var GroupVersion = unversioned.GroupVersion{Group: api.Group, Version: "v1beta1"}
// Codec encodes internal objects to the v1beta1 version for the abac group // Codec encodes internal objects to the v1beta1 version for the abac group
var Codec = runtime.CodecFor(api.Scheme, GroupVersion.String()) var Codec = runtime.CodecFor(api.Scheme, GroupVersion)
func init() { func init() {
api.Scheme.AddKnownTypes(GroupVersion, api.Scheme.AddKnownTypes(GroupVersion,

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

@ -61,7 +61,7 @@ func init() {
groupMeta := latest.GroupMeta{ groupMeta := latest.GroupMeta{
GroupVersion: preferredExternalVersion, GroupVersion: preferredExternalVersion,
GroupVersions: externalVersions, GroupVersions: externalVersions,
Codec: runtime.CodecFor(api.Scheme, preferredExternalVersion.String()), Codec: runtime.CodecFor(api.Scheme, preferredExternalVersion),
RESTMapper: newRESTMapper(externalVersions), RESTMapper: newRESTMapper(externalVersions),
SelfLinker: runtime.SelfLinker(accessor), SelfLinker: runtime.SelfLinker(accessor),
InterfacesFor: interfacesFor, InterfacesFor: interfacesFor,

2
pkg/apis/componentconfig/v1alpha1/register.go
View File

@ -28,7 +28,7 @@ const GroupName = "componentconfig"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1alpha1"} var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1alpha1"}
var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion.String()) var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion)
func init() { func init() {
addKnownTypes() addKnownTypes()

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

@ -61,7 +61,7 @@ func init() {
groupMeta := latest.GroupMeta{ groupMeta := latest.GroupMeta{
GroupVersion: preferredExternalVersion, GroupVersion: preferredExternalVersion,
GroupVersions: externalVersions, GroupVersions: externalVersions,
Codec: runtime.CodecFor(api.Scheme, preferredExternalVersion.String()), Codec: runtime.CodecFor(api.Scheme, preferredExternalVersion),
RESTMapper: newRESTMapper(externalVersions), RESTMapper: newRESTMapper(externalVersions),
SelfLinker: runtime.SelfLinker(accessor), SelfLinker: runtime.SelfLinker(accessor),
InterfacesFor: interfacesFor, InterfacesFor: interfacesFor,

2
pkg/apis/extensions/v1beta1/register.go
View File

@ -28,7 +28,7 @@ const GroupName = "extensions"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1beta1"} var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1beta1"}
var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion.String()) var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion)
func init() { func init() {
addKnownTypes() addKnownTypes()

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

@ -61,7 +61,7 @@ func init() {
groupMeta := latest.GroupMeta{ groupMeta := latest.GroupMeta{
GroupVersion: preferredExternalVersion, GroupVersion: preferredExternalVersion,
GroupVersions: externalVersions, GroupVersions: externalVersions,
Codec: runtime.CodecFor(api.Scheme, preferredExternalVersion.String()), Codec: runtime.CodecFor(api.Scheme, preferredExternalVersion),
RESTMapper: newRESTMapper(externalVersions), RESTMapper: newRESTMapper(externalVersions),
SelfLinker: runtime.SelfLinker(accessor), SelfLinker: runtime.SelfLinker(accessor),
InterfacesFor: interfacesFor, InterfacesFor: interfacesFor,

2
pkg/apis/metrics/v1alpha1/register.go
View File

@ -28,7 +28,7 @@ const GroupName = "metrics"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1alpha1"} var SchemeGroupVersion = unversioned.GroupVersion{Group: GroupName, Version: "v1alpha1"}
var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion.String()) var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion)
func init() { func init() {
// Register the API. // Register the API.

2
pkg/apiserver/apiserver.go
View File

@ -228,7 +228,7 @@ func serviceErrorHandler(requestResolver *RequestInfoResolver, apiVersions []str
for _, version := range apiVersions { for _, version := range apiVersions {
if requestInfo.APIVersion == version { if requestInfo.APIVersion == version {
// valid api version. // valid api version.
codec = runtime.CodecFor(api.Scheme, requestInfo.APIVersion) codec = runtime.CodecFor(api.Scheme, unversioned.GroupVersion{Group: requestInfo.APIGroup, Version: requestInfo.APIVersion})
break break
} }
} }

6
pkg/apiserver/apiserver_test.go
View File

@ -65,11 +65,11 @@ var prefix = "apis"
var grouplessGroupVersion = unversioned.GroupVersion{Group: "", Version: "v1"} var grouplessGroupVersion = unversioned.GroupVersion{Group: "", Version: "v1"}
var grouplessPrefix = "api" var grouplessPrefix = "api"
var grouplessCodec = runtime.CodecFor(api.Scheme, grouplessGroupVersion.String()) var grouplessCodec = runtime.CodecFor(api.Scheme, grouplessGroupVersion)
var groupVersions = []unversioned.GroupVersion{grouplessGroupVersion, testGroupVersion, newGroupVersion} var groupVersions = []unversioned.GroupVersion{grouplessGroupVersion, testGroupVersion, newGroupVersion}
var codec = runtime.CodecFor(api.Scheme, testGroupVersion.String()) var codec = runtime.CodecFor(api.Scheme, testGroupVersion)
var newCodec = runtime.CodecFor(api.Scheme, newGroupVersion.String()) var newCodec = runtime.CodecFor(api.Scheme, newGroupVersion)
var accessor = meta.NewAccessor() var accessor = meta.NewAccessor()
var versioner runtime.ResourceVersioner = accessor var versioner runtime.ResourceVersioner = accessor

2
pkg/client/unversioned/clientcmd/api/v1/register.go
View File

@ -27,7 +27,7 @@ import (
var SchemeGroupVersion = unversioned.GroupVersion{Group: "", Version: "v1"} var SchemeGroupVersion = unversioned.GroupVersion{Group: "", Version: "v1"}
// Codec encodes internal objects to the v1 scheme // Codec encodes internal objects to the v1 scheme
var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion.String()) var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion)
func init() { func init() {
api.Scheme.AddKnownTypes(SchemeGroupVersion, api.Scheme.AddKnownTypes(SchemeGroupVersion,

6
pkg/conversion/unversioned_test.go
View File

@ -26,6 +26,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
) )
@ -66,9 +67,8 @@ func TestV1EncodeDecodeStatus(t *testing.T) {
func TestExperimentalEncodeDecodeStatus(t *testing.T) { func TestExperimentalEncodeDecodeStatus(t *testing.T) {
// TODO: caesarxuchao: use the testapi.Extensions.Codec() once the PR that // TODO: caesarxuchao: use the testapi.Extensions.Codec() once the PR that
// moves experimental from v1 to v1beta1 got merged. // moves experimental from v1 to v1beta1 got merged.
// expCodec := testapi.Extensions.Codec() expCodec := runtime.CodecFor(api.Scheme, v1beta1.SchemeGroupVersion)
expCodec := runtime.CodecFor(api.Scheme, "extensions/v1beta1") encoded, err := expCodec.Encode(status)
encoded, err := runtime.Encode(expCodec, status)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }

4
pkg/kubectl/cmd/cmd_test.go
View File

@ -90,10 +90,10 @@ func newExternalScheme() (*runtime.Scheme, meta.RESTMapper, runtime.Codec) {
//This tests that kubectl will not confuse the external scheme with the internal scheme, even when they accidentally have versions of the same name. //This tests that kubectl will not confuse the external scheme with the internal scheme, even when they accidentally have versions of the same name.
scheme.AddKnownTypeWithName(validVersionGV.WithKind("Type"), &ExternalType2{}) scheme.AddKnownTypeWithName(validVersionGV.WithKind("Type"), &ExternalType2{})
codec := runtime.CodecFor(scheme, unlikelyGV.String()) codec := runtime.CodecFor(scheme, unlikelyGV)
mapper := meta.NewDefaultRESTMapper([]unversioned.GroupVersion{unlikelyGV, validVersionGV}, func(version unversioned.GroupVersion) (*meta.VersionInterfaces, error) { mapper := meta.NewDefaultRESTMapper([]unversioned.GroupVersion{unlikelyGV, validVersionGV}, func(version unversioned.GroupVersion) (*meta.VersionInterfaces, error) {
return &meta.VersionInterfaces{ return &meta.VersionInterfaces{
Codec: runtime.CodecFor(scheme, version.String()), Codec: runtime.CodecFor(scheme, version),
ObjectConvertor: scheme, ObjectConvertor: scheme,
MetadataAccessor: meta.NewAccessor(), MetadataAccessor: meta.NewAccessor(),
}, versionErrIfFalse(version == validVersionGV || version == unlikelyGV) }, versionErrIfFalse(version == validVersionGV || version == unlikelyGV)

2
pkg/kubectl/cmd/get_test.go
View File

@ -177,7 +177,7 @@ func TestGetUnknownSchemaObjectListGeneric(t *testing.T) {
}, },
} }
for k, test := range testCases { for k, test := range testCases {
apiCodec := runtime.CodecFor(api.Scheme, testapi.Default.GroupVersion().String()) apiCodec := runtime.CodecFor(api.Scheme, *testapi.Default.GroupVersion())
regularClient := &fake.RESTClient{ regularClient := &fake.RESTClient{
Codec: apiCodec, Codec: apiCodec,
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {

9
pkg/runtime/codec.go
View File

@ -19,6 +19,7 @@ package runtime
import ( import (
"io" "io"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/util/yaml" "k8s.io/kubernetes/pkg/util/yaml"
) )
@ -41,7 +42,7 @@ func DecodeInto(d Decoder, data []byte, into Object) error {
} }
// CodecFor returns a Codec that invokes Encode with the provided version. // CodecFor returns a Codec that invokes Encode with the provided version.
func CodecFor(codec ObjectCodec, version string) Codec { func CodecFor(codec ObjectCodec, version unversioned.GroupVersion) Codec {
return &codecWrapper{codec, version} return &codecWrapper{codec, version}
} }
@ -91,7 +92,7 @@ func EncodeOrDie(codec Codec, obj Object) string {
// default version for a scheme. // default version for a scheme.
type codecWrapper struct { type codecWrapper struct {
ObjectCodec ObjectCodec
version string version unversioned.GroupVersion
} }
// codecWrapper implements Decoder // codecWrapper implements Decoder
@ -99,11 +100,11 @@ var _ Decoder = &codecWrapper{}
// Encode implements Codec // Encode implements Codec
func (c *codecWrapper) Encode(obj Object) ([]byte, error) { func (c *codecWrapper) Encode(obj Object) ([]byte, error) {
return c.EncodeToVersion(obj, c.version) return c.EncodeToVersion(obj, c.version.String())
} }
func (c *codecWrapper) EncodeToStream(obj Object, stream io.Writer) error { func (c *codecWrapper) EncodeToStream(obj Object, stream io.Writer) error {
return c.EncodeToVersionStream(obj, c.version, stream) return c.EncodeToVersionStream(obj, c.version.String(), stream)
} }
// TODO: Make this behaviour default when we move everyone away from // TODO: Make this behaviour default when we move everyone away from

2
pkg/runtime/scheme_test.go
View File

@ -306,7 +306,7 @@ func TestEncode(t *testing.T) {
scheme.AddInternalGroupVersion(internalGV) scheme.AddInternalGroupVersion(internalGV)
scheme.AddKnownTypeWithName(internalGV.WithKind("Simple"), &InternalSimple{}) scheme.AddKnownTypeWithName(internalGV.WithKind("Simple"), &InternalSimple{})
scheme.AddKnownTypeWithName(externalGV.WithKind("Simple"), &ExternalSimple{}) scheme.AddKnownTypeWithName(externalGV.WithKind("Simple"), &ExternalSimple{})
codec := runtime.CodecFor(scheme, externalGV.String()) codec := runtime.CodecFor(scheme, externalGV)
test := &InternalSimple{ test := &InternalSimple{
TestString: "I'm the same", TestString: "I'm the same",
} }

2
pkg/storage/etcd/etcd_helper_test.go
View File

@ -46,7 +46,7 @@ func init() {
scheme = runtime.NewScheme() scheme = runtime.NewScheme()
scheme.AddKnownTypes(testapi.Default.InternalGroupVersion(), &storagetesting.TestResource{}) scheme.AddKnownTypes(testapi.Default.InternalGroupVersion(), &storagetesting.TestResource{})
scheme.AddKnownTypes(*testapi.Default.GroupVersion(), &storagetesting.TestResource{}) scheme.AddKnownTypes(*testapi.Default.GroupVersion(), &storagetesting.TestResource{})
codec = runtime.CodecFor(scheme, testapi.Default.GroupVersion().String()) codec = runtime.CodecFor(scheme, *testapi.Default.GroupVersion())
scheme.AddConversionFuncs( scheme.AddConversionFuncs(
func(in *storagetesting.TestResource, out *storagetesting.TestResource, s conversion.Scope) error { func(in *storagetesting.TestResource, out *storagetesting.TestResource, s conversion.Scope) error {
*out = *in *out = *in

2
plugin/pkg/scheduler/api/v1/register.go
View File

@ -27,7 +27,7 @@ import (
var SchemeGroupVersion = unversioned.GroupVersion{Group: "", Version: "v1"} var SchemeGroupVersion = unversioned.GroupVersion{Group: "", Version: "v1"}
// Codec encodes internal objects to the v1 scheme // Codec encodes internal objects to the v1 scheme
var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion.String()) var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion)
func init() { func init() {
api.Scheme.AddKnownTypes(SchemeGroupVersion, api.Scheme.AddKnownTypes(SchemeGroupVersion,