apimachinery: handle duplicated and conflicting type registration

2017-02-21 12:49:19 +01:00
parent 6050f59b7b
commit 395be3b401
12 changed files with 95 additions and 28 deletions
--- a/pkg/apis/rbac/register.go
+++ b/pkg/apis/rbac/register.go
@@ -17,7 +17,6 @@ limitations under the License.
 package rbac

 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
@@ -55,6 +54,5 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&ClusterRoleBindingList{},
 		&ClusterRoleList{},
 	)
-	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }