github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #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 https://github.com/kubernetes/kubernetes/pull/48601
pull/6/head
Kubernetes Submit Queue 2017-07-08 15:33:26 -07:00 committed by GitHub
parent 8d42a34ccd da3322c2d9
commit 8c07c9aa8b
16 changed files with 5 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

2
pkg/api/ref/ref_test.go
View File

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

2
pkg/apis/abac/v0/register.go
View File

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

2
pkg/apis/abac/v1beta1/register.go
View File

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

3
pkg/controller/garbagecollector/metaonly/metaonly.go
View File

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

1
pkg/kubectl/testing/BUILD
View File

@ -18,7 +18,6 @@ go_library(
deps = [ deps = [
"//vendor/github.com/ugorji/go/codec:go_default_library", "//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/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", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
], ],
) )

3
pkg/kubectl/testing/types.go
View File

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

2
staging/src/k8s.io/apimachinery/pkg/runtime/register.go
View File

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

9
staging/src/k8s.io/apimachinery/pkg/runtime/scheme_test.go
View File

@ -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 // redefine InternalSimple with the same name, but obviously as a different type than in runtimetesting
type InternalSimple struct { type InternalSimple struct {
EmbeddableTypeMeta `json:",inline"` runtime.TypeMeta `json:",inline"`
TestString string `json:"testString"` TestString string `json:"testString"`
} }
func (s *InternalSimple) DeepCopyObject() runtime.Object { return nil } func (s *InternalSimple) DeepCopyObject() runtime.Object { return nil }

22
staging/src/k8s.io/apimachinery/pkg/runtime/testing/types.go
View File

@ -190,23 +190,5 @@ func (obj *MyWeirdCustomEmbeddedVersionKindField) GroupVersionKind() schema.Grou
return schema.FromAPIVersionAndKind(obj.APIVersion, obj.ObjectKind) return schema.FromAPIVersionAndKind(obj.APIVersion, obj.ObjectKind)
} }
func (obj *TestType2) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind } func (obj *TestType2) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }
func (obj *ExternalTestType2) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind } func (obj *ExternalTestType2) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }
func (obj *InternalComplex) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ExternalComplex) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *EmbeddedTest) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *EmbeddedTestExternal) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *InternalSimple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ExternalSimple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *InternalOptionalExtensionType) GetObjectKind() schema.ObjectKind {
return &obj.TypeMeta
}
func (obj *ObjectTestExternal) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ObjectTest) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ExternalOptionalExtensionType) GetObjectKind() schema.ObjectKind {
return &obj.TypeMeta
}
func (obj *InternalExtensionType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ExternalExtensionType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ExtensionA) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ExtensionB) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

2
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go
View File

@ -64,8 +64,6 @@ type TestPatchSubType struct {
StringField string `json:"theField"` StringField string `json:"theField"`
} }
func (obj *testPatchType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func TestPatchAnonymousField(t *testing.T) { func TestPatchAnonymousField(t *testing.T) {
testGV := schema.GroupVersion{Group: "", Version: "v"} testGV := schema.GroupVersion{Group: "", Version: "v"}
scheme.AddKnownTypes(testGV, &testPatchType{}) scheme.AddKnownTypes(testGV, &testPatchType{})

1
staging/src/k8s.io/apiserver/pkg/endpoints/testing/BUILD
View File

@ -20,7 +20,6 @@ go_library(
"//vendor/github.com/ugorji/go/codec:go_default_library", "//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/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
], ],
) )

11
staging/src/k8s.io/apiserver/pkg/endpoints/testing/types.go
View File

@ -18,7 +18,6 @@ package testing
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
) )
type Simple struct { type Simple struct {
@ -30,8 +29,6 @@ type Simple struct {
Labels map[string]string `json:"labels,omitempty"` Labels map[string]string `json:"labels,omitempty"`
} }
func (obj *Simple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
type SimpleRoot struct { type SimpleRoot struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata"` metav1.ObjectMeta `json:"metadata"`
@ -41,8 +38,6 @@ type SimpleRoot struct {
Labels map[string]string `json:"labels,omitempty"` Labels map[string]string `json:"labels,omitempty"`
} }
func (obj *SimpleRoot) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
type SimpleGetOptions struct { type SimpleGetOptions struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
Param1 string `json:"param1"` Param1 string `json:"param1"`
@ -57,8 +52,6 @@ func (SimpleGetOptions) SwaggerDoc() map[string]string {
} }
} }
func (obj *SimpleGetOptions) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
type SimpleList struct { type SimpleList struct {
metav1.TypeMeta `json:",inline"` metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,inline"` metav1.ListMeta `json:"metadata,inline"`
@ -66,8 +59,6 @@ type SimpleList struct {
Items []Simple `json:"items,omitempty"` Items []Simple `json:"items,omitempty"`
} }
func (obj *SimpleList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
// SimpleXGSubresource is a cross group subresource, i.e. the subresource does not belong to the // SimpleXGSubresource is a cross group subresource, i.e. the subresource does not belong to the
// same group as its parent resource. // same group as its parent resource.
type SimpleXGSubresource struct { type SimpleXGSubresource struct {
@ -76,5 +67,3 @@ type SimpleXGSubresource struct {
SubresourceInfo string `json:"subresourceInfo,omitempty"` SubresourceInfo string `json:"subresourceInfo,omitempty"`
Labels map[string]string `json:"labels,omitempty"` Labels map[string]string `json:"labels,omitempty"`
} }
func (obj *SimpleXGSubresource) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

1
staging/src/k8s.io/apiserver/pkg/storage/testing/BUILD
View File

@ -24,7 +24,6 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage:go_default_library",
], ],

3
staging/src/k8s.io/apiserver/pkg/storage/testing/types.go
View File

@ -18,7 +18,6 @@ package testing
import ( import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
) )
type TestResource struct { type TestResource struct {
@ -26,5 +25,3 @@ type TestResource struct {
metav1.ObjectMeta `json:"metadata"` metav1.ObjectMeta `json:"metadata"`
Value int `json:"value"` Value int `json:"value"`
} }
func (obj *TestResource) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }