Merge pull request #1789 from rzetelskik/override-resource-helpers-sc…

…heme Make resource helpers scheme configurable through exported variable
scylladb · Mar 4, 2024 · 596b9c8 · 596b9c8
2 parents 0308d14 + b4bec43
commit 596b9c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 29 deletions.
diff --git 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