From 47b410f58b4f00c010a2238d4faff44d16582315 Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Wed, 3 May 2017 18:02:20 -0700
Subject: [PATCH] Remove redundent GetObjectKind() defined on top-level types

TypeMeta is embedded in all these types and TypeMeta has GetObjectKind()
method to implement the runtime.Object interface.
---
 federation/apis/federation/register.go                        | 3 ---
 federation/apis/federation/v1beta1/register.go                | 3 ---
 pkg/apis/abac/register.go                                     | 2 --
 pkg/apis/authorization/v1/register.go                         | 4 ----
 pkg/apis/authorization/v1beta1/register.go                    | 4 ----
 pkg/apis/certificates/register.go                             | 3 ---
 pkg/apis/certificates/v1beta1/register.go                     | 3 ---
 pkg/apis/componentconfig/register.go                          | 4 ----
 pkg/apis/componentconfig/v1alpha1/register.go                 | 4 ----
 .../apis/podtolerationrestriction/register.go                 | 2 --
 .../apis/podtolerationrestriction/v1alpha1/register.go        | 2 --
 .../admission/resourcequota/apis/resourcequota/register.go    | 2 --
 .../resourcequota/apis/resourcequota/v1alpha1/register.go     | 2 --
 plugin/pkg/scheduler/api/register.go                          | 2 --
 plugin/pkg/scheduler/api/v1/register.go                       | 2 --
 .../k8s.io/client-go/pkg/apis/authorization/v1/register.go    | 4 ----
 .../client-go/pkg/apis/authorization/v1beta1/register.go      | 4 ----
 .../src/k8s.io/client-go/pkg/apis/certificates/register.go    | 3 ---
 .../client-go/pkg/apis/certificates/v1beta1/register.go       | 3 ---
 19 files changed, 56 deletions(-)

diff --git a/federation/apis/federation/register.go b/federation/apis/federation/register.go
index 78f54810bc1..9fe9bfc865a 100644
--- a/federation/apis/federation/register.go
+++ b/federation/apis/federation/register.go
@@ -49,6 +49,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *Cluster) GetObjectKind() schema.ObjectKind     { return &obj.TypeMeta }
-func (obj *ClusterList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
diff --git a/federation/apis/federation/v1beta1/register.go b/federation/apis/federation/v1beta1/register.go
index a7863833fe4..10932175f58 100644
--- a/federation/apis/federation/v1beta1/register.go
+++ b/federation/apis/federation/v1beta1/register.go
@@ -51,6 +51,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }
-
-func (obj *Cluster) GetObjectKind() schema.ObjectKind     { return &obj.TypeMeta }
-func (obj *ClusterList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
diff --git a/pkg/apis/abac/register.go b/pkg/apis/abac/register.go
index bef7968d371..fdf3d31d0bb 100644
--- a/pkg/apis/abac/register.go
+++ b/pkg/apis/abac/register.go
@@ -50,5 +50,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *Policy) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
diff --git a/pkg/apis/authorization/v1/register.go b/pkg/apis/authorization/v1/register.go
index 060bf981b3a..5defdff6750 100644
--- a/pkg/apis/authorization/v1/register.go
+++ b/pkg/apis/authorization/v1/register.go
@@ -59,7 +59,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }
-
-func (obj *LocalSubjectAccessReview) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
-func (obj *SubjectAccessReview) GetObjectKind() schema.ObjectKind      { return &obj.TypeMeta }
-func (obj *SelfSubjectAccessReview) GetObjectKind() schema.ObjectKind  { return &obj.TypeMeta }
diff --git a/pkg/apis/authorization/v1beta1/register.go b/pkg/apis/authorization/v1beta1/register.go
index afcce0b7323..599501cd067 100644
--- a/pkg/apis/authorization/v1beta1/register.go
+++ b/pkg/apis/authorization/v1beta1/register.go
@@ -59,7 +59,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }
-
-func (obj *LocalSubjectAccessReview) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
-func (obj *SubjectAccessReview) GetObjectKind() schema.ObjectKind      { return &obj.TypeMeta }
-func (obj *SelfSubjectAccessReview) GetObjectKind() schema.ObjectKind  { return &obj.TypeMeta }
diff --git a/pkg/apis/certificates/register.go b/pkg/apis/certificates/register.go
index f9d228d00e7..085737583fc 100644
--- a/pkg/apis/certificates/register.go
+++ b/pkg/apis/certificates/register.go
@@ -50,6 +50,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *CertificateSigningRequest) GetObjectKind() schema.ObjectKind     { return &obj.TypeMeta }
-func (obj *CertificateSigningRequestList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
diff --git a/pkg/apis/certificates/v1beta1/register.go b/pkg/apis/certificates/v1beta1/register.go
index 82f73cd6156..582916c8b68 100644
--- a/pkg/apis/certificates/v1beta1/register.go
+++ b/pkg/apis/certificates/v1beta1/register.go
@@ -64,6 +64,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }
-
-func (obj *CertificateSigningRequest) GetObjectKind() schema.ObjectKind     { return &obj.TypeMeta }
-func (obj *CertificateSigningRequestList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
diff --git a/pkg/apis/componentconfig/register.go b/pkg/apis/componentconfig/register.go
index 88f4c3b8370..8599f522e85 100644
--- a/pkg/apis/componentconfig/register.go
+++ b/pkg/apis/componentconfig/register.go
@@ -51,7 +51,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *KubeProxyConfiguration) GetObjectKind() schema.ObjectKind     { return &obj.TypeMeta }
-func (obj *KubeSchedulerConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
-func (obj *KubeletConfiguration) GetObjectKind() schema.ObjectKind       { return &obj.TypeMeta }
diff --git a/pkg/apis/componentconfig/v1alpha1/register.go b/pkg/apis/componentconfig/v1alpha1/register.go
index 3ec0581d8a4..93a2c5ff2ee 100644
--- a/pkg/apis/componentconfig/v1alpha1/register.go
+++ b/pkg/apis/componentconfig/v1alpha1/register.go
@@ -50,7 +50,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *KubeProxyConfiguration) GetObjectKind() schema.ObjectKind     { return &obj.TypeMeta }
-func (obj *KubeSchedulerConfiguration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
-func (obj *KubeletConfiguration) GetObjectKind() schema.ObjectKind       { return &obj.TypeMeta }
diff --git a/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/register.go b/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/register.go
index 8f85e761ee9..2dc917b0ff4 100644
--- a/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/register.go
+++ b/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/register.go
@@ -48,5 +48,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *Configuration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
diff --git a/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1/register.go b/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1/register.go
index b1f2109cd23..3270ec80036 100644
--- a/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1/register.go
+++ b/plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1alpha1/register.go
@@ -48,5 +48,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *Configuration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
diff --git a/plugin/pkg/admission/resourcequota/apis/resourcequota/register.go b/plugin/pkg/admission/resourcequota/apis/resourcequota/register.go
index 3003db25df1..57abb758db1 100644
--- a/plugin/pkg/admission/resourcequota/apis/resourcequota/register.go
+++ b/plugin/pkg/admission/resourcequota/apis/resourcequota/register.go
@@ -49,5 +49,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *Configuration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
diff --git a/plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1/register.go b/plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1/register.go
index 7db7c4fbcc4..5b4117695a2 100644
--- a/plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1/register.go
+++ b/plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1/register.go
@@ -48,5 +48,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *Configuration) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
diff --git a/plugin/pkg/scheduler/api/register.go b/plugin/pkg/scheduler/api/register.go
index 9225b6b9077..a627997540d 100644
--- a/plugin/pkg/scheduler/api/register.go
+++ b/plugin/pkg/scheduler/api/register.go
@@ -51,5 +51,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *Policy) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
diff --git a/plugin/pkg/scheduler/api/v1/register.go b/plugin/pkg/scheduler/api/v1/register.go
index 2e56af739d1..406c2e03f57 100644
--- a/plugin/pkg/scheduler/api/v1/register.go
+++ b/plugin/pkg/scheduler/api/v1/register.go
@@ -54,5 +54,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *Policy) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/register.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/register.go
index 060bf981b3a..5defdff6750 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/register.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/register.go
@@ -59,7 +59,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }
-
-func (obj *LocalSubjectAccessReview) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
-func (obj *SubjectAccessReview) GetObjectKind() schema.ObjectKind      { return &obj.TypeMeta }
-func (obj *SelfSubjectAccessReview) GetObjectKind() schema.ObjectKind  { return &obj.TypeMeta }
diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/register.go
index afcce0b7323..599501cd067 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/register.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/register.go
@@ -59,7 +59,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }
-
-func (obj *LocalSubjectAccessReview) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
-func (obj *SubjectAccessReview) GetObjectKind() schema.ObjectKind      { return &obj.TypeMeta }
-func (obj *SelfSubjectAccessReview) GetObjectKind() schema.ObjectKind  { return &obj.TypeMeta }
diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/register.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/register.go
index f9d228d00e7..085737583fc 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/certificates/register.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/register.go
@@ -50,6 +50,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	)
 	return nil
 }
-
-func (obj *CertificateSigningRequest) GetObjectKind() schema.ObjectKind     { return &obj.TypeMeta }
-func (obj *CertificateSigningRequestList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/register.go
index 82f73cd6156..582916c8b68 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/register.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/register.go
@@ -64,6 +64,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }
-
-func (obj *CertificateSigningRequest) GetObjectKind() schema.ObjectKind     { return &obj.TypeMeta }
-func (obj *CertificateSigningRequestList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }