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

use policy/v1 instead of policy/v1beta1 (#2732)

mine
Prasad Katti 2024-06-08 08:39:29 -07:00 committed by GitHub
parent 8fe7a1ac8c
commit c4ff75c81a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/model/registry.go
View File

@ -184,7 +184,7 @@ var Registry = map[string]ResourceMeta{
}, },
// Policy... // Policy...
"policy/v1beta1/poddisruptionbudgets": { "policy/v1/poddisruptionbudgets": {
Renderer: &render.PodDisruptionBudget{}, Renderer: &render.PodDisruptionBudget{},
}, },

4
internal/render/pdb.go
View File

@ -10,7 +10,7 @@ import (
"github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/client"
"github.com/derailed/k9s/internal/model1" "github.com/derailed/k9s/internal/model1"
"github.com/derailed/tview" "github.com/derailed/tview"
v1beta1 "k8s.io/api/policy/v1beta1" v1 "k8s.io/api/policy/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
@ -44,7 +44,7 @@ func (p PodDisruptionBudget) Render(o interface{}, ns string, r *model1.Row) err
if !ok { if !ok {
return fmt.Errorf("expected PodDisruptionBudget, but got %T", o) return fmt.Errorf("expected PodDisruptionBudget, but got %T", o)
} }
var pdb v1beta1.PodDisruptionBudget var pdb v1.PodDisruptionBudget
err := runtime.DefaultUnstructuredConverter.FromUnstructured(raw.Object, &pdb) err := runtime.DefaultUnstructuredConverter.FromUnstructured(raw.Object, &pdb)
if err != nil { if err != nil {
return err return err

6
internal/render/testdata/pdb.json vendored
View File

@ -1,16 +1,16 @@
{ {
"apiVersion": "policy/v1beta1", "apiVersion": "policy/v1",
"kind": "PodDisruptionBudget", "kind": "PodDisruptionBudget",
"metadata": { "metadata": {
"annotations": { "annotations": {
"kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"policy/v1beta1\",\"kind\":\"PodDisruptionBudget\",\"metadata\":{\"annotations\":{},\"name\":\"fred\",\"namespace\":\"default\"},\"spec\":{\"minAvailable\":2,\"selector\":{\"matchLabels\":{\"app\":\"nginx\"}}}}\n" "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"policy/v1\",\"kind\":\"PodDisruptionBudget\",\"metadata\":{\"annotations\":{},\"name\":\"fred\",\"namespace\":\"default\"},\"spec\":{\"minAvailable\":2,\"selector\":{\"matchLabels\":{\"app\":\"nginx\"}}}}\n"
}, },
"creationTimestamp": "2019-08-31T03:48:10Z", "creationTimestamp": "2019-08-31T03:48:10Z",
"generation": 1, "generation": 1,
"name": "fred", "name": "fred",
"namespace": "default", "namespace": "default",
"resourceVersion": "49885429", "resourceVersion": "49885429",
"selfLink": "/apis/policy/v1beta1/namespaces/default/poddisruptionbudgets/fred", "selfLink": "/apis/policy/v1/namespaces/default/poddisruptionbudgets/fred",
"uid": "26b6cf70-cba2-11e9-990f-42010a800218" "uid": "26b6cf70-cba2-11e9-990f-42010a800218"
}, },
"spec": { "spec": {

2
internal/xray/tree_node.go
View File

@ -489,7 +489,7 @@ func toEmoji(gvr string) string {
return "👨🏻‍" return "👨🏻‍"
case "networking.k8s.io/v1/networkpolicies": case "networking.k8s.io/v1/networkpolicies":
return "📕" return "📕"
case "policy/v1beta1/poddisruptionbudgets": case "policy/v1/poddisruptionbudgets":
return "🏷 " return "🏷 "
case "policy/v1beta1/podsecuritypolicies": case "policy/v1beta1/podsecuritypolicies":
return "👮‍♂️" return "👮‍♂️"