diff --git a/pkg/resource/helpers.go b/pkg/resource/helpers.go index 31239b0755b..720ab1b932b 100644 --- a/pkg/resource/helpers.go +++ b/pkg/resource/helpers.go @@ -9,6 +9,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" ) +var Scheme = scheme.Scheme + func newUnknownGVK() *schema.GroupVersionKind { return &schema.GroupVersionKind{ Group: "unknown", @@ -23,7 +25,7 @@ func GetObjectGVK(object runtime.Object) (*schema.GroupVersionKind, error) { return &gvk, nil } - kinds, _, err := scheme.Scheme.ObjectKinds(object) + kinds, _, err := Scheme.ObjectKinds(object) if err != nil { return nil, err } @@ -40,7 +42,7 @@ func GetObjectGVKOrUnknown(obj runtime.Object) *schema.GroupVersionKind { return &gvk } - kinds, _, err := scheme.Scheme.ObjectKinds(obj) + kinds, _, err := Scheme.ObjectKinds(obj) if err != nil || len(kinds) == 0 { t := reflect.TypeOf(obj) if t.Kind() == reflect.Ptr { diff --git a/pkg/util/resource/helpers.go b/pkg/util/resource/helpers.go deleted file mode 100644 index 4a1c1755e45..00000000000 --- a/pkg/util/resource/helpers.go +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (C) 2021 ScyllaDB - -package resource - -import ( - "github.com/pkg/errors" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/kubernetes/scheme" -) - -func GetObjectGVK(object runtime.Object) (*schema.GroupVersionKind, error) { - gvk := object.GetObjectKind().GroupVersionKind() - if len(gvk.Kind) > 0 { - return &gvk, nil - } - - kinds, _, err := scheme.Scheme.ObjectKinds(object) - if err != nil { - return nil, err - } - if len(kinds) == 0 { - return nil, errors.New("no kind found") - } - - return &kinds[0], nil -}