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

Fix Get CustomResourceDefinition(#1711) (#1722) 

* Fix  Get CustomResourceDefinition(#1711)

* Update crd_test.go
mine
muicoder 2022-09-18 21:11:59 +08:00 committed by GitHub
parent 638d7d4442
commit cab718387c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/render/crd.go
View File

@ -2,7 +2,6 @@ package render
import ( import (
"fmt" "fmt"
"path"
"github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/client"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
@ -38,19 +37,7 @@ func (CustomResourceDefinition) Render(o interface{}, ns string, r *Row) error {
return err return err
} }
var version string r.ID = client.FQN(client.ClusterScope, crd.GetName())
for _, v := range crd.Spec.Versions {
if v.Served && !v.Deprecated {
version = v.Name
break
}
}
if version == "" {
return fmt.Errorf("unable to assert resource version")
}
id := path.Join(crd.Spec.Group, version, crd.Spec.Names.Plural)
r.ID = client.FQN(client.ClusterScope, id)
r.Fields = Fields{ r.Fields = Fields{
crd.GetName(), crd.GetName(),
mapToIfc(crd.GetLabels()), mapToIfc(crd.GetLabels()),

2
internal/render/crd_test.go
View File

@ -12,6 +12,6 @@ func TestCustomResourceDefinitionRender(t *testing.T) {
r := render.NewRow(2) r := render.NewRow(2)
c.Render(load(t, "crd"), "", &r) c.Render(load(t, "crd"), "", &r)
assert.Equal(t, "-/config.istio.io/v1alpha2/adapters", r.ID) assert.Equal(t, "-/adapters.config.istio.io", r.ID)
assert.Equal(t, render.Fields{"adapters.config.istio.io"}, r.Fields[:1]) assert.Equal(t, render.Fields{"adapters.config.istio.io"}, r.Fields[:1])
} }