Merge pull request #4584 from niuyueyang1996/implement-node/pod-tableconvert

Implement node/pod tableconvert

Author: karmada-bot

pkg/printers/storage/storage.go

@@ -22,17 +22,27 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
 
 	"github.com/karmada-io/karmada/pkg/printers"
 )
 
 // TableConvertor struct - converts objects to metav1.Table using printers.TableGenerator
 type TableConvertor struct {
+	defaultTableConvert rest.TableConvertor
 	printers.TableGenerator
 }
 
-// ConvertToTable method - converts objects to metav1.Table objects using TableGenerator
-func (c TableConvertor) ConvertToTable(_ context.Context, obj runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
+// NewTableConvertor create TableConvertor struct with defaultTableConvert and TableGenerator
+func NewTableConvertor(defaultTableConvert rest.TableConvertor, tableGenerator printers.TableGenerator) rest.TableConvertor {
+	return &TableConvertor{
+		defaultTableConvert: defaultTableConvert,
+		TableGenerator:      tableGenerator,
+	}
+}
+
+// ConvertToTable method - converts objects to metav1.Table objects using TableGenerator and defaultTableConvert
+func (c TableConvertor) ConvertToTable(ctx context.Context, obj runtime.Object, tableOptions runtime.Object) (*metav1.Table, error) {
 	noHeaders := false
 	if tableOptions != nil {
 		switch t := tableOptions.(type) {
@@ -44,5 +54,12 @@ func (c TableConvertor) ConvertToTable(_ context.Context, obj runtime.Object, ta
 			return nil, fmt.Errorf("unrecognized type %T for table options, can't display tabular output", tableOptions)
 		}
 	}
-	return c.TableGenerator.GenerateTable(obj, printers.GenerateOptions{Wide: true, NoHeaders: noHeaders})
+	tableResult, err := c.TableGenerator.GenerateTable(obj, printers.GenerateOptions{Wide: true, NoHeaders: noHeaders})
+	if err == nil {
+		return tableResult, err
+	}
+	if c.defaultTableConvert == nil {
+		return tableResult, err
+	}
+	return c.defaultTableConvert.ConvertToTable(ctx, obj, tableOptions)
 }

pkg/printers/storage/storage_test.go

@@ -0,0 +1,89 @@
+/*
+Copyright 2024 The Karmada Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package storage
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	"github.com/karmada-io/karmada/pkg/printers"
+	printersinternal "github.com/karmada-io/karmada/pkg/util/lifted"
+)
+
+func TestPrintHandlerStorage(t *testing.T) {
+	convert := NewTableConvertor(
+		rest.NewDefaultTableConvertor(schema.GroupResource{}),
+		printers.NewTableGenerator().With(printersinternal.AddCoreV1Handlers))
+	testCases := []struct {
+		object runtime.Object
+	}{
+		{
+			object: &v1.Pod{
+				ObjectMeta: metav1.ObjectMeta{Name: "test1"},
+				Spec:       v1.PodSpec{},
+				Status: v1.PodStatus{
+					Phase:  v1.PodPending,
+					HostIP: "1.2.3.4",
+					PodIP:  "2.3.4.5",
+				},
+			},
+		},
+		{
+			object: &v1.Node{
+				TypeMeta:   metav1.TypeMeta{},
+				ObjectMeta: metav1.ObjectMeta{Name: "node1"},
+				Spec:       v1.NodeSpec{},
+				Status: v1.NodeStatus{
+					Phase: v1.NodeTerminated,
+					Addresses: []v1.NodeAddress{
+						{
+							Type:    v1.NodeInternalIP,
+							Address: "1.2.3.4",
+						},
+					},
+				},
+			},
+		},
+		{
+			object: &v1.Service{
+				TypeMeta:   metav1.TypeMeta{},
+				ObjectMeta: metav1.ObjectMeta{Name: "svc1"},
+				Spec: v1.ServiceSpec{
+					Selector:  nil,
+					ClusterIP: "4.4.4.4",
+					Type:      v1.ServiceTypeClusterIP,
+				},
+			},
+		},
+	}
+	for i, tc := range testCases {
+		tc := tc
+		t.Run(fmt.Sprintf("object=%#v", tc.object), func(t *testing.T) {
+			_, err := convert.ConvertToTable(context.Background(), tc.object, nil)
+			if err != nil {
+				t.Errorf("index %v ConvertToTable error: %#v", i, err)
+			}
+		})
+	}
+}

pkg/search/proxy/framework/plugins/cache/cache.go

@@ -32,9 +32,12 @@ import (
 	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/client-go/kubernetes/scheme"
 
+	"github.com/karmada-io/karmada/pkg/printers"
+	printerstorage "github.com/karmada-io/karmada/pkg/printers/storage"
 	"github.com/karmada-io/karmada/pkg/search/proxy/framework"
 	pluginruntime "github.com/karmada-io/karmada/pkg/search/proxy/framework/runtime"
 	"github.com/karmada-io/karmada/pkg/search/proxy/store"
+	printerslifted "github.com/karmada-io/karmada/pkg/util/lifted"
 )
 
 const (
@@ -83,9 +86,11 @@ func (c *Cache) SupportRequest(request framework.ProxyRequest) bool {
 func (c *Cache) Connect(_ context.Context, request framework.ProxyRequest) (http.Handler, error) {
 	requestInfo := request.RequestInfo
 	r := &rester{
-		store:          c.store,
-		gvr:            request.GroupVersionResource,
-		tableConvertor: rest.NewDefaultTableConvertor(request.GroupVersionResource.GroupResource()),
+		store: c.store,
+		gvr:   request.GroupVersionResource,
+		tableConvertor: printerstorage.NewTableConvertor(
+			rest.NewDefaultTableConvertor(request.GroupVersionResource.GroupResource()),
+			printers.NewTableGenerator().With(printerslifted.AddCoreV1Handlers)),
 	}
 
 	gvk, err := c.restMapper.KindFor(request.GroupVersionResource)