Switch API objects to not register per version codecs

Remove Codec from versionInterfaces in meta (RESTMapper is now agnostic to codec and serialization). Register api/latest.Codecs as the codec factory and use latest.Codecs.LegacyCodec(version) as an equvialent to the previous codec.
lavalamp · Jan 22, 2016 · c1d932e · c1d932e
1 parent 125ef6f
commit c1d932e
Show file tree

Hide file tree

Showing 54 changed files with 258 additions and 239 deletions.
diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/install/install.go b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/install/install.go
@@ -68,7 +68,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	groupMeta := apimachinery.GroupMeta{
 		GroupVersion:  preferredExternalVersion,
 		GroupVersions: externalVersions,
-		Codec:         runtime.CodecFor(api.Scheme, preferredExternalVersion),
 		RESTMapper:    newRESTMapper(externalVersions),
 		SelfLinker:    runtime.SelfLinker(accessor),
 		InterfacesFor: interfacesFor,
@@ -97,7 +96,6 @@ func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, e
 	switch version {
 	case v1.SchemeGroupVersion:
 		return &meta.VersionInterfaces{
-			Codec:            v1.Codec,
 			ObjectConvertor:  api.Scheme,
 			MetadataAccessor: accessor,
 		}, nil

diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/register.go b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/register.go
@@ -22,7 +22,7 @@ import (
 	"k8s.io/kubernetes/pkg/runtime"
 )
 
-var SchemeGroupVersion = unversioned.GroupVersion{Group: "testgroup", Version: ""}
+var SchemeGroupVersion = unversioned.GroupVersion{Group: "testgroup", Version: runtime.APIVersionInternal}
 
 func AddToScheme(scheme *runtime.Scheme) {
 	// Add the API to Scheme.

diff --git a/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1/register.go b/cmd/libs/go2idl/client-gen/testdata/apis/testgroup/v1/register.go
@@ -17,16 +17,13 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 
 var SchemeGroupVersion = unversioned.GroupVersion{Group: "testgroup", Version: "v1"}
 
-var Codec = runtime.CodecFor(api.Scheme, SchemeGroupVersion)
-
 func AddToScheme(scheme *runtime.Scheme) {
 	// Add the API to Scheme.
 	addKnownTypes(scheme)

diff --git a/pkg/api/conversion.go b/pkg/api/conversion.go
@@ -22,14 +22,9 @@ import (
 	"k8s.io/kubernetes/pkg/conversion"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
-	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util/intstr"
 )
 
-// Codec is the identity codec for this package - it can only convert itself
-// to itself.
-var Codec = runtime.CodecFor(Scheme, unversioned.GroupVersion{})
-
 func init() {
 	Scheme.AddDefaultingFuncs(
 		func(obj *ListOptions) {

diff --git a/pkg/api/conversion_test.go b/pkg/api/conversion_test.go
@@ -22,6 +22,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
+	"k8s.io/kubernetes/pkg/runtime"
 )
 
 func BenchmarkPodConversion(b *testing.B) {
@@ -30,7 +31,7 @@ func BenchmarkPodConversion(b *testing.B) {
 		b.Fatalf("Unexpected error while reading file: %v", err)
 	}
 	var pod api.Pod
-	if err := api.Scheme.DecodeInto(data, &pod); err != nil {
+	if err := runtime.DecodeInto(testapi.Default.Codec(), data, &pod); err != nil {
 		b.Fatalf("Unexpected error decoding pod: %v", err)
 	}
 
@@ -41,7 +42,7 @@ func BenchmarkPodConversion(b *testing.B) {
 		if err != nil {
 			b.Fatalf("Conversion error: %v", err)
 		}
-		obj, err := scheme.ConvertToVersion(versionedObj, scheme.InternalVersions[testapi.Default.GroupVersion().Group].String())
+		obj, err := scheme.ConvertToVersion(versionedObj, testapi.Default.InternalGroupVersion().String())
 		if err != nil {
 			b.Fatalf("Conversion error: %v", err)
 		}
@@ -58,7 +59,7 @@ func BenchmarkNodeConversion(b *testing.B) {
 		b.Fatalf("Unexpected error while reading file: %v", err)
 	}
 	var node api.Node
-	if err := api.Scheme.DecodeInto(data, &node); err != nil {
+	if err := runtime.DecodeInto(testapi.Default.Codec(), data, &node); err != nil {
 		b.Fatalf("Unexpected error decoding node: %v", err)
 	}
 
@@ -69,7 +70,7 @@ func BenchmarkNodeConversion(b *testing.B) {
 		if err != nil {
 			b.Fatalf("Conversion error: %v", err)
 		}
-		obj, err := scheme.ConvertToVersion(versionedObj, scheme.InternalVersions[testapi.Default.GroupVersion().Group].String())
+		obj, err := scheme.ConvertToVersion(versionedObj, testapi.Default.InternalGroupVersion().String())
 		if err != nil {
 			b.Fatalf("Conversion error: %v", err)
 		}
@@ -86,7 +87,7 @@ func BenchmarkReplicationControllerConversion(b *testing.B) {
 		b.Fatalf("Unexpected error while reading file: %v", err)
 	}
 	var replicationController api.ReplicationController
-	if err := api.Scheme.DecodeInto(data, &replicationController); err != nil {
+	if err := runtime.DecodeInto(testapi.Default.Codec(), data, &replicationController); err != nil {
 		b.Fatalf("Unexpected error decoding node: %v", err)
 	}
 
@@ -97,7 +98,7 @@ func BenchmarkReplicationControllerConversion(b *testing.B) {
 		if err != nil {
 			b.Fatalf("Conversion error: %v", err)
 		}
-		obj, err := scheme.ConvertToVersion(versionedObj, scheme.InternalVersions[testapi.Default.GroupVersion().Group].String())
+		obj, err := scheme.ConvertToVersion(versionedObj, testapi.Default.InternalGroupVersion().String())
 		if err != nil {
 			b.Fatalf("Conversion error: %v", err)
 		}

diff --git a/pkg/api/copy_test.go b/pkg/api/copy_test.go
@@ -54,7 +54,7 @@ func doDeepCopyTest(t *testing.T, kind unversioned.GroupVersionKind, f *fuzz.Fuz
 	}
 
 	if !reflect.DeepEqual(item, itemCopy) {
-		t.Errorf("\nexpected: %#v\n\ngot:      %#v\n\ndiff:      %v", item, itemCopy, util.ObjectDiff(item, itemCopy))
+		t.Errorf("\nexpected: %#v\n\ngot:      %#v\n\ndiff:      %v", item, itemCopy, util.ObjectGoPrintSideBySide(item, itemCopy))
 	}
 }
 

diff --git a/pkg/api/deep_copy_test.go b/pkg/api/deep_copy_test.go
@@ -21,6 +21,8 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/testapi"
+	"k8s.io/kubernetes/pkg/runtime"
 )
 
 func BenchmarkPodCopy(b *testing.B) {
@@ -29,7 +31,7 @@ func BenchmarkPodCopy(b *testing.B) {
 		b.Fatalf("Unexpected error while reading file: %v", err)
 	}
 	var pod api.Pod
-	if err := api.Scheme.DecodeInto(data, &pod); err != nil {
+	if err := runtime.DecodeInto(testapi.Default.Codec(), data, &pod); err != nil {
 		b.Fatalf("Unexpected error decoding pod: %v", err)
 	}
 
@@ -52,7 +54,7 @@ func BenchmarkNodeCopy(b *testing.B) {
 		b.Fatalf("Unexpected error while reading file: %v", err)
 	}
 	var node api.Node
-	if err := api.Scheme.DecodeInto(data, &node); err != nil {
+	if err := runtime.DecodeInto(testapi.Default.Codec(), data, &node); err != nil {
 		b.Fatalf("Unexpected error decoding node: %v", err)
 	}
 
@@ -75,7 +77,7 @@ func BenchmarkReplicationControllerCopy(b *testing.B) {
 		b.Fatalf("Unexpected error while reading file: %v", err)
 	}
 	var replicationController api.ReplicationController
-	if err := api.Scheme.DecodeInto(data, &replicationController); err != nil {
+	if err := runtime.DecodeInto(testapi.Default.Codec(), data, &replicationController); err != nil {
 		b.Fatalf("Unexpected error decoding node: %v", err)
 	}
 

diff --git a/pkg/api/install/install.go b/pkg/api/install/install.go
@@ -24,14 +24,13 @@ import (
 	"github.com/golang/glog"
 
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apimachinery"
-	"k8s.io/kubernetes/pkg/apimachinery/registered"
-	"k8s.io/kubernetes/pkg/util/sets"
-
 	"k8s.io/kubernetes/pkg/api/meta"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/kubernetes/pkg/apimachinery"
+	"k8s.io/kubernetes/pkg/apimachinery/registered"
 	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util/sets"
 )
 
 const importPrefix = "k8s.io/kubernetes/pkg/api"
@@ -75,7 +74,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
 	groupMeta := apimachinery.GroupMeta{
 		GroupVersion:  preferredExternalVersion,
 		GroupVersions: externalVersions,
-		Codec:         runtime.CodecFor(api.Scheme, preferredExternalVersion),
 		RESTMapper:    newRESTMapper(externalVersions),
 		SelfLinker:    runtime.SelfLinker(accessor),
 		InterfacesFor: interfacesFor,
@@ -127,7 +125,6 @@ func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, e
 	switch version {
 	case v1.SchemeGroupVersion:
 		return &meta.VersionInterfaces{
-			Codec:            v1.Codec,
 			ObjectConvertor:  api.Scheme,
 			MetadataAccessor: accessor,
 		}, nil

diff --git a/pkg/api/install/install_test.go b/pkg/api/install/install_test.go
@@ -18,11 +18,13 @@ package install
 
 import (
 	"encoding/json"
+	"reflect"
 	"testing"
 
 	internal "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/apimachinery/registered"
+	"k8s.io/kubernetes/pkg/runtime"
 )
 
 func TestResourceVersioner(t *testing.T) {
@@ -49,7 +51,7 @@ func TestCodec(t *testing.T) {
 	pod := internal.Pod{}
 	// We do want to use package registered rather than testapi here, because we
 	// want to test if the package install and package registered work as expected.
-	data, err := registered.GroupOrDie(internal.GroupName).Codec.Encode(&pod)
+	data, err := runtime.Encode(internal.Codecs.LegacyCodec(registered.GroupOrDie(internal.GroupName).GroupVersion), &pod)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -100,8 +102,8 @@ func TestRESTMapper(t *testing.T) {
 		}
 
 		interfaces, _ := registered.GroupOrDie(internal.GroupName).InterfacesFor(version)
-		if mapping.Codec != interfaces.Codec {
-			t.Errorf("unexpected codec: %#v, expected: %#v", mapping, interfaces)
+		if mapping.ObjectConvertor != interfaces.ObjectConvertor {
+			t.Errorf("unexpected: %#v, expected: %#v", mapping, interfaces)
 		}
 
 		rc := &internal.ReplicationController{ObjectMeta: internal.ObjectMeta{Name: "foo"}}
@@ -114,3 +116,14 @@ func TestRESTMapper(t *testing.T) {
 		}
 	}
 }
+
+func TestUnversioned(t *testing.T) {
+	for _, obj := range []runtime.Object{
+		&unversioned.Status{},
+		&unversioned.ExportOptions{},
+	} {
+		if unversioned, ok := internal.Scheme.IsUnversioned(obj); !unversioned || !ok {
+			t.Errorf("%v is expected to be unversioned", reflect.TypeOf(obj))
+		}
+	}
+}
diff --git a/pkg/api/meta/help.go b/pkg/api/meta/help.go
@@ -120,7 +120,7 @@ func SetList(list runtime.Object, objects []runtime.Object) error {
 		} else if src.Type().ConvertibleTo(dest.Type()) {
 			dest.Set(src.Convert(dest.Type()))
 		} else {
-			return fmt.Errorf("item[%d]: Type mismatch: Expected %v, got %v", i, dest.Type(), src.Type())
+			return fmt.Errorf("item[%d]: can't assign or convert %v into %v", i, src.Type(), dest.Type())
 		}
 	}
 	items.Set(slice)

diff --git a/pkg/api/meta/interfaces.go b/pkg/api/meta/interfaces.go
@@ -24,7 +24,6 @@ import (
 
 // VersionInterfaces contains the interfaces one should use for dealing with types of a particular version.
 type VersionInterfaces struct {
-	runtime.Codec
 	runtime.ObjectConvertor
 	MetadataAccessor
 }
@@ -142,7 +141,6 @@ type RESTMapping struct {
 	// Scope contains the information needed to deal with REST Resources that are in a resource hierarchy
 	Scope RESTScope
 
-	runtime.Codec
 	runtime.ObjectConvertor
 	MetadataAccessor
 }

diff --git a/pkg/api/meta/meta_test.go b/pkg/api/meta/meta_test.go
@@ -73,7 +73,7 @@ func TestAPIObjectMeta(t *testing.T) {
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if e, a := "/a", typeAccessor.GetAPIVersion(); e != a {
+	if e, a := "a", typeAccessor.GetAPIVersion(); e != a {
 		t.Errorf("expected %v, got %v", e, a)
 	}
 	if e, a := "b", typeAccessor.GetKind(); e != a {
@@ -102,7 +102,7 @@ func TestAPIObjectMeta(t *testing.T) {
 	if e, a := types.UID("other"), j.UID; e != a {
 		t.Errorf("expected %v, got %v", e, a)
 	}
-	if e, a := "/c", j.APIVersion; e != a {
+	if e, a := "c", j.APIVersion; e != a {
 		t.Errorf("expected %v, got %v", e, a)
 	}
 	if e, a := "d", j.Kind; e != a {
@@ -117,7 +117,7 @@ func TestAPIObjectMeta(t *testing.T) {
 
 	typeAccessor.SetAPIVersion("d")
 	typeAccessor.SetKind("e")
-	if e, a := "/d", j.APIVersion; e != a {
+	if e, a := "d", j.APIVersion; e != a {
 		t.Errorf("expected %v, got %v", e, a)
 	}
 	if e, a := "e", j.Kind; e != a {
@@ -308,7 +308,7 @@ func TestGenericTypeMetaAccessor(t *testing.T) {
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
-	if e, a := "/a", apiVersion; e != a {
+	if e, a := "a", apiVersion; e != a {
 		t.Errorf("expected %v, got %v", e, a)
 	}
 	kind, err := accessor.Kind(j)
@@ -392,7 +392,7 @@ func TestGenericTypeMetaAccessor(t *testing.T) {
 	if e, a := "other", j.TypeMeta.UID; e != a {
 		t.Errorf("expected %v, got %v", e, a)
 	}
-	if e, a := "/c", j.TypeMeta.APIVersion; e != a {
+	if e, a := "c", j.TypeMeta.APIVersion; e != a {
 		t.Errorf("expected %v, got %v", e, a)
 	}
 	if e, a := "d", j.TypeMeta.Kind; e != a {
@@ -757,7 +757,7 @@ func BenchmarkAccessorSetReflection(b *testing.B) {
 			Name:            "foo",
 			GenerateName:    "prefix",
 			UID:             "uid",
-			APIVersion:      "/a",
+			APIVersion:      "a",
 			Kind:            "b",
 			ResourceVersion: "1",
 			SelfLink:        "some/place/only/we/know",

diff --git a/pkg/api/meta/restmapper.go b/pkg/api/meta/restmapper.go
@@ -23,6 +23,7 @@ import (
 	"strings"
 
 	"k8s.io/kubernetes/pkg/api/unversioned"
+	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util/sets"
 )
 
@@ -84,15 +85,15 @@ type DefaultRESTMapper struct {
 
 var _ RESTMapper = &DefaultRESTMapper{}
 
-// VersionInterfacesFunc returns the appropriate codec, typer, and metadata accessor for a
+// VersionInterfacesFunc returns the appropriate typer, and metadata accessor for a
 // given api version, or an error if no such api version exists.
 type VersionInterfacesFunc func(version unversioned.GroupVersion) (*VersionInterfaces, error)
 
 // NewDefaultRESTMapper initializes a mapping between Kind and APIVersion
 // to a resource name and back based on the objects in a runtime.Scheme
 // and the Kubernetes API conventions. Takes a group name, a priority list of the versions
 // to search when an object has no default version (set empty to return an error),
-// and a function that retrieves the correct codec and metadata for a given version.
+// and a function that retrieves the correct metadata for a given version.
 func NewDefaultRESTMapper(defaultGroupVersions []unversioned.GroupVersion, f VersionInterfacesFunc) *DefaultRESTMapper {
 	resourceToKind := make(map[unversioned.GroupVersionResource]unversioned.GroupVersionKind)
 	kindToPluralResource := make(map[unversioned.GroupVersionKind]unversioned.GroupVersionResource)
@@ -251,6 +252,9 @@ func (m *DefaultRESTMapper) ResourceFor(resource unversioned.GroupVersionResourc
 
 func (m *DefaultRESTMapper) KindsFor(input unversioned.GroupVersionResource) ([]unversioned.GroupVersionKind, error) {
 	resource := input.GroupVersion().WithResource(strings.ToLower(input.Resource))
+	if resource.Version == runtime.APIVersionInternal {
+		resource.Version = ""
+	}
 
 	hasResource := len(resource.Resource) > 0
 	hasGroup := len(resource.Group) > 0
@@ -412,7 +416,7 @@ func (m *DefaultRESTMapper) RESTMapping(gk unversioned.GroupKind, versions ...st
 	var gvk *unversioned.GroupVersionKind
 	hadVersion := false
 	for _, version := range versions {
-		if len(version) == 0 {
+		if len(version) == 0 || version == runtime.APIVersionInternal {
 			continue
 		}
 
@@ -472,7 +476,6 @@ func (m *DefaultRESTMapper) RESTMapping(gk unversioned.GroupKind, versions ...st
 		GroupVersionKind: *gvk,
 		Scope:            scope,
 
-		Codec:            interfaces.Codec,
 		ObjectConvertor:  interfaces.ObjectConvertor,
 		MetadataAccessor: interfaces.MetadataAccessor,
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	if !reflect.DeepEqual(item, itemCopy) {
-    		t.Errorf("\nexpected: %#v\n\ngot:      %#v\n\ndiff:      %v", item, itemCopy, util.ObjectDiff(item, itemCopy))
+    		t.Errorf("\nexpected: %#v\n\ngot:      %#v\n\ndiff:      %v", item, itemCopy, util.ObjectGoPrintSideBySide(item, itemCopy))
     	}
     }
@@ Expand Down @@