Skip to content

Commit eb5e347

Browse files
authored
Merge pull request #2535 from L3n41c/fix_gvrfromtype
fix: panic in `util.GVRFromType` for core objects
2 parents 45b7e20 + 110f03d commit eb5e347

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

pkg/util/utils.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,10 @@ func GVRFromType(resourceName string, expectedType interface{}) *schema.GroupVer
125125
return nil
126126
}
127127
apiVersion := expectedType.(*unstructured.Unstructured).Object["apiVersion"].(string)
128-
expectedTypeSlice := strings.Split(apiVersion, "/")
129-
g := expectedTypeSlice[0]
130-
v := expectedTypeSlice[1]
131-
if v == "" /* "" group (core) objects */ {
132-
v = expectedTypeSlice[0]
128+
g, v, found := strings.Cut(apiVersion, "/")
129+
if !found {
130+
g = "core"
131+
v = apiVersion
133132
}
134133
r := resourceName
135134
return &schema.GroupVersionResource{

0 commit comments

Comments
 (0)