From c2333f673fcfc3424bac283810d0d63148e9fa74 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Wed, 29 Jun 2016 00:51:08 -0700
Subject: [PATCH] Some internal types are not registered to all output versions

Specifically JobTemplate in batch is not in extensions/v1beta1
---
 pkg/api/serialization_test.go   | 6 +++++-
 pkg/apis/extensions/register.go | 1 +
 pkg/apis/policy/register.go     | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go
index ec2894a8d03..f3af252aec5 100644
--- a/pkg/api/serialization_test.go
+++ b/pkg/api/serialization_test.go
@@ -92,7 +92,11 @@ func roundTrip(t *testing.T, codec runtime.Codec, item runtime.Object) {
 	name := reflect.TypeOf(item).Elem().Name()
 	data, err := runtime.Encode(codec, item)
 	if err != nil {
-		t.Errorf("%v: %v (%s)", name, err, printer.Sprintf("%#v", item))
+		if runtime.IsNotRegisteredError(err) {
+			t.Logf("%v: not registered: %v (%s)", name, err, printer.Sprintf("%#v", item))
+		} else {
+			t.Errorf("%v: %v (%s)", name, err, printer.Sprintf("%#v", item))
+		}
 		return
 	}
 
diff --git a/pkg/apis/extensions/register.go b/pkg/apis/extensions/register.go
index f12335b97c2..d4168eefae8 100644
--- a/pkg/apis/extensions/register.go
+++ b/pkg/apis/extensions/register.go
@@ -68,6 +68,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&Ingress{},
 		&IngressList{},
 		&api.ListOptions{},
+		&api.DeleteOptions{},
 		&ReplicaSet{},
 		&ReplicaSetList{},
 		&api.ExportOptions{},
diff --git a/pkg/apis/policy/register.go b/pkg/apis/policy/register.go
index 0b219dff702..d9c26d2e82e 100644
--- a/pkg/apis/policy/register.go
+++ b/pkg/apis/policy/register.go
@@ -17,6 +17,7 @@ limitations under the License.
 package policy
 
 import (
+	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
 )
@@ -48,6 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&PodDisruptionBudget{},
 		&PodDisruptionBudgetList{},
+		&api.ListOptions{},
 	)
 	return nil
 }