Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: panic in util.GVRFromType for structured types #2553

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: panic in util.GVRFromType for structured types #2553

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8859a42
Fix a panic in GVRFromType for structured types
L3n41c Nov 8, 2024
4a96a78
Log an error instead of panicking
L3n41c Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pkg/util/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"runtime"
"strings"

"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/discovery"
"k8s.io/client-go/dynamic"
Expand Down Expand Up @@ -142,7 +142,12 @@ func GVRFromType(resourceName string, expectedType interface{}) *schema.GroupVer
// testUnstructuredMock.Foo is a mock type for testing
return nil
}
apiVersion := expectedType.(*unstructured.Unstructured).Object["apiVersion"].(string)
t, err := meta.TypeAccessor(expectedType)
if err != nil {
klog.ErrorS(err, "Failed to get type accessor", "expectedType", expectedType)
return nil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies to block this again, but since this is used in a bunch of critical paths in CRS procedures, continuing silently after an error wouldn't make sense. I'd push for changing the signature here, and surfacing this up, as pointed in my previous review.

}
apiVersion := t.GetAPIVersion()
g, v, found := strings.Cut(apiVersion, "/")
if !found {
g = "core"
Expand Down
Loading