jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ensure crd gvr group suffix is trimmed

mine
derailed 2025-02-16 11:42:08 -07:00
parent 19a5fb64ac
commit 61f0f80c4a
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
internal/dao/registry.go
View File

@ -411,13 +411,15 @@ func loadCRDs(f Factory, m ResourceMetas) {
log.Err(err).Msg("boom")
continue
}
gvr, version, ok := newGVRFromCRD(&crd)
if !ok {
continue
}
if gvr, version, ok := newGVRFromCRD(&crd); ok {
if meta, ok := m[gvr]; ok && version.Subresources != nil && version.Subresources.Scale != nil {
if !slices.Contains(meta.Categories, scaleCat) {
meta.Categories = append(meta.Categories, scaleCat)
m[gvr] = meta
}
if meta, ok := m[gvr]; ok && version.Subresources != nil && version.Subresources.Scale != nil {
if !slices.Contains(meta.Categories, scaleCat) {
meta.Categories = append(meta.Categories, scaleCat)
m[gvr] = meta
}
}
}
@ -427,13 +429,10 @@ func newGVRFromCRD(crd *apiext.CustomResourceDefinition) (client.GVR, apiext.Cus
for _, v := range crd.Spec.Versions {
if v.Served && !v.Deprecated {
return client.NewGVRFromMeta(metav1.APIResource{
Kind: crd.Spec.Names.Kind,
Group: crd.Spec.Group,
Name: crd.Spec.Names.Plural,
Version: v.Name,
ShortNames: crd.Spec.Names.ShortNames,
SingularName: crd.Spec.Names.Plural,
Namespaced: crd.Spec.Scope == apiext.NamespaceScoped,
Kind: crd.Spec.Names.Kind,
Group: crd.Spec.Group,
Name: strings.TrimSuffix(crd.Name, "."+crd.Spec.Group),
Version: v.Name,
}), v, true
}
}