Skip to content

Commit 8c07c9a

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#48608 from sttts/sttts-typemeta-getobjectkind
Automatic merge from submit-queue (batch tested with PRs 47040, 48597, 48608, 48653) apimachinery: remove unneeded GetObjectKind() impls Based on kubernetes#48601
2 parents 8d42a34 + da3322c commit 8c07c9a

File tree

16 files changed

+5
-65
lines changed

16 files changed

+5
-65
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
3838
scheme.AddKnownTypes(SchemeGroupVersion)
3939
return nil
4040
}
41-
42-
func (obj *TestType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
43-
func (obj *TestTypeList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
5252
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
5353
return nil
5454
}
55-
56-
func (obj *TestType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
57-
func (obj *TestTypeList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

‎pkg/api/ref/ref_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ type ExtensionAPIObject struct {
3535
metav1.ObjectMeta
3636
}
3737

38-
func (obj *ExtensionAPIObject) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
39-
4038
func TestGetReference(t *testing.T) {
4139

4240
// when vendoring kube, if you don't force the set of registered versions (like make test does)

‎pkg/apis/abac/v0/register.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
6060
)
6161
return nil
6262
}
63-
64-
func (obj *Policy) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

‎pkg/apis/abac/v1beta1/register.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
6060
)
6161
return nil
6262
}
63-
64-
func (obj *Policy) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

‎pkg/controller/garbagecollector/metaonly/metaonly.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ import (
2727
"k8s.io/kubernetes/pkg/api"
2828
)
2929

30-
func (obj *MetadataOnlyObject) GetObjectKind() schema.ObjectKind { return obj }
31-
func (obj *MetadataOnlyObjectList) GetObjectKind() schema.ObjectKind { return obj }
32-
3330
type metaOnlyJSONScheme struct{}
3431

3532
// This function can be extended to mapping different gvk to different MetadataOnlyObject,

‎pkg/kubectl/testing/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ go_library(
1818
deps = [
1919
"//vendor/github.com/ugorji/go/codec:go_default_library",
2020
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
21-
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
2221
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
2322
],
2423
)

‎pkg/kubectl/testing/types.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package testing
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21-
"k8s.io/apimachinery/pkg/runtime/schema"
2221
)
2322

2423
type TestStruct struct {
@@ -30,5 +29,3 @@ type TestStruct struct {
3029
StringList []string `json:"StringList"`
3130
IntList []int `json:"IntList"`
3231
}
33-
34-
func (obj *TestStruct) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (obj *TypeMeta) GroupVersionKind() schema.GroupVersionKind {
2828
return schema.FromAPIVersionAndKind(obj.APIVersion, obj.Kind)
2929
}
3030

31-
func (obj *Unknown) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
31+
func (obj *TypeMeta) GetObjectKind() schema.ObjectKind { return obj }
3232

3333
// GetObjectKind implements Object for VersionedObjects, returning an empty ObjectKind
3434
// 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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -441,15 +441,10 @@ func TestAddKnownTypesIdemPotent(t *testing.T) {
441441
}
442442
}
443443

444-
// EmbeddableTypeMeta passes GetObjectKind to the type which embeds it.
445-
type EmbeddableTypeMeta runtime.TypeMeta
446-
447-
func (tm *EmbeddableTypeMeta) GetObjectKind() schema.ObjectKind { return (*runtime.TypeMeta)(tm) }
448-
449444
// redefine InternalSimple with the same name, but obviously as a different type than in runtimetesting
450445
type InternalSimple struct {
451-
EmbeddableTypeMeta `json:",inline"`
452-
TestString string `json:"testString"`
446+
runtime.TypeMeta `json:",inline"`
447+
TestString string `json:"testString"`
453448
}
454449

455450
func (s *InternalSimple) DeepCopyObject() runtime.Object { return nil }

‎staging/src/k8s.io/apimachinery/pkg/runtime/testing/types.go

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -190,23 +190,5 @@ func (obj *MyWeirdCustomEmbeddedVersionKindField) GroupVersionKind() schema.Grou
190190
return schema.FromAPIVersionAndKind(obj.APIVersion, obj.ObjectKind)
191191
}
192192

193-
func (obj *TestType2) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }
194-
func (obj *ExternalTestType2) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }
195-
func (obj *InternalComplex) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
196-
func (obj *ExternalComplex) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
197-
func (obj *EmbeddedTest) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
198-
func (obj *EmbeddedTestExternal) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
199-
func (obj *InternalSimple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
200-
func (obj *ExternalSimple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
201-
func (obj *InternalOptionalExtensionType) GetObjectKind() schema.ObjectKind {
202-
return &obj.TypeMeta
203-
}
204-
func (obj *ObjectTestExternal) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
205-
func (obj *ObjectTest) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
206-
func (obj *ExternalOptionalExtensionType) GetObjectKind() schema.ObjectKind {
207-
return &obj.TypeMeta
208-
}
209-
func (obj *InternalExtensionType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
210-
func (obj *ExternalExtensionType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
211-
func (obj *ExtensionA) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
212-
func (obj *ExtensionB) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
193+
func (obj *TestType2) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }
194+
func (obj *ExternalTestType2) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }

‎staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ type TestPatchSubType struct {
6464
StringField string `json:"theField"`
6565
}
6666

67-
func (obj *testPatchType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
68-
6967
func TestPatchAnonymousField(t *testing.T) {
7068
testGV := schema.GroupVersion{Group: "", Version: "v"}
7169
scheme.AddKnownTypes(testGV, &testPatchType{})

‎staging/src/k8s.io/apiserver/pkg/endpoints/testing/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ go_library(
2020
"//vendor/github.com/ugorji/go/codec:go_default_library",
2121
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
2222
"//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
23-
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
2423
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
2524
],
2625
)

‎staging/src/k8s.io/apiserver/pkg/endpoints/testing/types.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package testing
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21-
"k8s.io/apimachinery/pkg/runtime/schema"
2221
)
2322

2423
type Simple struct {
@@ -30,8 +29,6 @@ type Simple struct {
3029
Labels map[string]string `json:"labels,omitempty"`
3130
}
3231

33-
func (obj *Simple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
34-
3532
type SimpleRoot struct {
3633
metav1.TypeMeta `json:",inline"`
3734
metav1.ObjectMeta `json:"metadata"`
@@ -41,8 +38,6 @@ type SimpleRoot struct {
4138
Labels map[string]string `json:"labels,omitempty"`
4239
}
4340

44-
func (obj *SimpleRoot) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
45-
4641
type SimpleGetOptions struct {
4742
metav1.TypeMeta `json:",inline"`
4843
Param1 string `json:"param1"`
@@ -57,17 +52,13 @@ func (SimpleGetOptions) SwaggerDoc() map[string]string {
5752
}
5853
}
5954

60-
func (obj *SimpleGetOptions) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
61-
6255
type SimpleList struct {
6356
metav1.TypeMeta `json:",inline"`
6457
metav1.ListMeta `json:"metadata,inline"`
6558
// +optional
6659
Items []Simple `json:"items,omitempty"`
6760
}
6861

69-
func (obj *SimpleList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
70-
7162
// SimpleXGSubresource is a cross group subresource, i.e. the subresource does not belong to the
7263
// same group as its parent resource.
7364
type SimpleXGSubresource struct {
@@ -76,5 +67,3 @@ type SimpleXGSubresource struct {
7667
SubresourceInfo string `json:"subresourceInfo,omitempty"`
7768
Labels map[string]string `json:"labels,omitempty"`
7869
}
79-
80-
func (obj *SimpleXGSubresource) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

‎staging/src/k8s.io/apiserver/pkg/storage/testing/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ go_library(
2424
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
2525
"//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
2626
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
27-
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
2827
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
2928
"//vendor/k8s.io/apiserver/pkg/storage:go_default_library",
3029
],

‎staging/src/k8s.io/apiserver/pkg/storage/testing/types.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@ package testing
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21-
"k8s.io/apimachinery/pkg/runtime/schema"
2221
)
2322

2423
type TestResource struct {
2524
metav1.TypeMeta `json:",inline"`
2625
metav1.ObjectMeta `json:"metadata"`
2726
Value int `json:"value"`
2827
}
29-
30-
func (obj *TestResource) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

0 commit comments

Comments
 (0)