From 07a502d3a276b6175079c1965012b592a605b112 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 21 Feb 2017 12:49:19 +0100 Subject: [PATCH] apimachinery: handle duplicated and conflicting type registration Kubernetes-commit: 395be3b4010b0eef63e98961a14064360fdca26c --- pkg/apis/apiserver/register.go | 2 -- pkg/apis/example/register.go | 2 -- pkg/storage/etcd/etcd_helper_test.go | 1 - 3 files changed, 5 deletions(-) diff --git a/pkg/apis/apiserver/register.go b/pkg/apis/apiserver/register.go index 4fd86879f..1410518b9 100644 --- a/pkg/apis/apiserver/register.go +++ b/pkg/apis/apiserver/register.go @@ -17,7 +17,6 @@ limitations under the License. package apiserver import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -47,6 +46,5 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &AdmissionConfiguration{}, ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil } diff --git a/pkg/apis/example/register.go b/pkg/apis/example/register.go index fad13e864..2b699c4b4 100644 --- a/pkg/apis/example/register.go +++ b/pkg/apis/example/register.go @@ -17,7 +17,6 @@ limitations under the License. package example import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) @@ -48,6 +47,5 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &Pod{}, ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil } diff --git a/pkg/storage/etcd/etcd_helper_test.go b/pkg/storage/etcd/etcd_helper_test.go index 5845e0a2c..4cce5f85a 100644 --- a/pkg/storage/etcd/etcd_helper_test.go +++ b/pkg/storage/etcd/etcd_helper_test.go @@ -77,7 +77,6 @@ func testScheme(t *testing.T) (*runtime.Scheme, serializer.CodecFactory) { scheme := runtime.NewScheme() scheme.Log(t) scheme.AddKnownTypes(schema.GroupVersion{Version: runtime.APIVersionInternal}, &storagetesting.TestResource{}) - scheme.AddKnownTypes(schema.GroupVersion{Version: runtime.APIVersionInternal}, &storagetesting.TestResource{}) example.AddToScheme(scheme) examplev1.AddToScheme(scheme) if err := scheme.AddConversionFuncs(