apimachinery: remove unneeded GetObjectKind() impls

Author: sttts

cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go

@@ -38,6 +38,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion)
 	return nil
 }
-
-func (obj *TestType) GetObjectKind() schema.ObjectKind     { return &obj.TypeMeta }
-func (obj *TestTypeList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go

@@ -52,6 +52,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }
-
-func (obj *TestType) GetObjectKind() schema.ObjectKind     { return &obj.TypeMeta }
-func (obj *TestTypeList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

pkg/api/ref/ref_test.go

@@ -35,8 +35,6 @@ type ExtensionAPIObject struct {
 	metav1.ObjectMeta
 }
 
-func (obj *ExtensionAPIObject) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
-
 func TestGetReference(t *testing.T) {
 
 	// when vendoring kube, if you don't force the set of registered versions (like make test does)

pkg/apis/abac/v0/register.go

@@ -60,5 +60,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *Policy) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

pkg/apis/abac/v1beta1/register.go

@@ -60,5 +60,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *Policy) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

pkg/controller/garbagecollector/metaonly/metaonly.go

@@ -27,9 +27,6 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 )
 
-func (obj *MetadataOnlyObject) GetObjectKind() schema.ObjectKind     { return obj }
-func (obj *MetadataOnlyObjectList) GetObjectKind() schema.ObjectKind { return obj }
-
 type metaOnlyJSONScheme struct{}
 
 // This function can be extended to mapping different gvk to different MetadataOnlyObject,

pkg/kubectl/testing/BUILD

@@ -18,7 +18,6 @@ go_library(
     deps = [
         "//vendor/github.com/ugorji/go/codec:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
     ],
 )

pkg/kubectl/testing/types.go

@@ -18,7 +18,6 @@ package testing
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 type TestStruct struct {
@@ -30,5 +29,3 @@ type TestStruct struct {
 	StringList        []string       `json:"StringList"`
 	IntList           []int          `json:"IntList"`
 }
-
-func (obj *TestStruct) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

staging/src/k8s.io/apimachinery/pkg/runtime/register.go

@@ -28,7 +28,7 @@ func (obj *TypeMeta) GroupVersionKind() schema.GroupVersionKind {
 	return schema.FromAPIVersionAndKind(obj.APIVersion, obj.Kind)
 }
 
-func (obj *Unknown) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
+func (obj *TypeMeta) GetObjectKind() schema.ObjectKind { return obj }
 
 // GetObjectKind implements Object for VersionedObjects, returning an empty ObjectKind
 // interface if no objects are provided, or the ObjectKind interface of the object in the

staging/src/k8s.io/apimachinery/pkg/runtime/scheme_test.go

@@ -441,15 +441,10 @@ func TestAddKnownTypesIdemPotent(t *testing.T) {
 	}
 }
 
-// EmbeddableTypeMeta passes GetObjectKind to the type which embeds it.
-type EmbeddableTypeMeta runtime.TypeMeta
-
-func (tm *EmbeddableTypeMeta) GetObjectKind() schema.ObjectKind { return (*runtime.TypeMeta)(tm) }
-
 // redefine InternalSimple with the same name, but obviously as a different type than in runtimetesting
 type InternalSimple struct {
-	EmbeddableTypeMeta `json:",inline"`
-	TestString         string `json:"testString"`
+	runtime.TypeMeta `json:",inline"`
+	TestString       string `json:"testString"`
 }
 
 func (s *InternalSimple) DeepCopyObject() runtime.Object { return nil }