kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apimachinery: handle duplicated and conflicting type registration 

Kubernetes-commit: 395be3b4010b0eef63e98961a14064360fdca26c
This commit is contained in:
Dr. Stefan Schimanski 2017-02-21 12:49:19 +01:00 committed by Kubernetes Publisher
parent 53343624bb
commit 07a502d3a2
3 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/apiserver/register.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package apiserver package apiserver
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
) )
@ -47,6 +46,5 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&AdmissionConfiguration{}, &AdmissionConfiguration{},
) )
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil return nil
} }

2
pkg/apis/example/register.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package example package example
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
) )
@ -48,6 +47,5 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&Pod{}, &Pod{},
) )
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil return nil
} }

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

@ -77,7 +77,6 @@ func testScheme(t *testing.T) (*runtime.Scheme, serializer.CodecFactory) {
scheme := runtime.NewScheme() scheme := runtime.NewScheme()
scheme.Log(t) scheme.Log(t)
scheme.AddKnownTypes(schema.GroupVersion{Version: runtime.APIVersionInternal}, &storagetesting.TestResource{}) scheme.AddKnownTypes(schema.GroupVersion{Version: runtime.APIVersionInternal}, &storagetesting.TestResource{})
scheme.AddKnownTypes(schema.GroupVersion{Version: runtime.APIVersionInternal}, &storagetesting.TestResource{})
example.AddToScheme(scheme) example.AddToScheme(scheme)
examplev1.AddToScheme(scheme) examplev1.AddToScheme(scheme)
if err := scheme.AddConversionFuncs( if err := scheme.AddConversionFuncs(