Update pkg/printers with Kubernetes v1.24.2

Signed-off-by: AllenZMC <zhongming.chang@daocloud.io>

pkg/printers/internalversion/printers_test.go

@@ -25,14 +25,14 @@ func TestPrintCluster(t *testing.T) {
 					SyncMode: clusterapis.Push,
 				},
 				Status: clusterapis.ClusterStatus{
-					KubernetesVersion: "1.21.7",
+					KubernetesVersion: "1.24.2",
 					Conditions: []metav1.Condition{
 						{Type: clusterapis.ClusterConditionReady, Status: metav1.ConditionTrue},
 					},
 				},
 			},
 			printers.GenerateOptions{Wide: false},
-			[]metav1.TableRow{{Cells: []interface{}{"test1", "1.21.7", clusterapis.ClusterSyncMode("Push"), "True", "<unknown>"}}},
+			[]metav1.TableRow{{Cells: []interface{}{"test1", "1.24.2", clusterapis.ClusterSyncMode("Push"), "True", "<unknown>"}}},
 		},
 		{
 			clusterapis.Cluster{
@@ -42,14 +42,14 @@ func TestPrintCluster(t *testing.T) {
 					APIEndpoint: "https://kubernetes.default.svc.cluster.local:6443",
 				},
 				Status: clusterapis.ClusterStatus{
-					KubernetesVersion: "1.21.7",
+					KubernetesVersion: "1.24.2",
 					Conditions: []metav1.Condition{
 						{Type: clusterapis.ClusterConditionReady, Status: metav1.ConditionTrue},
 					},
 				},
 			},
 			printers.GenerateOptions{Wide: true},
-			[]metav1.TableRow{{Cells: []interface{}{"test2", "1.21.7", clusterapis.ClusterSyncMode("Push"), "True", "<unknown>", "https://kubernetes.default.svc.cluster.local:6443"}}},
+			[]metav1.TableRow{{Cells: []interface{}{"test2", "1.24.2", clusterapis.ClusterSyncMode("Push"), "True", "<unknown>", "https://kubernetes.default.svc.cluster.local:6443"}}},
 		},
 	}
 

pkg/printers/tablegenerator.go

@@ -110,13 +110,11 @@ func (h *HumanReadableGenerator) GenerateTable(obj runtime.Object, options Gener
 	}
 	if m, err := meta.ListAccessor(obj); err == nil {
 		table.ResourceVersion = m.GetResourceVersion()
-		table.SelfLink = m.GetSelfLink()
 		table.Continue = m.GetContinue()
 		table.RemainingItemCount = m.GetRemainingItemCount()
 	} else {
 		if m, err := meta.CommonAccessor(obj); err == nil {
 			table.ResourceVersion = m.GetResourceVersion()
-			table.SelfLink = m.GetSelfLink()
 		}
 	}
 	return table, nil

pkg/printers/tablegenerator_test.go

@@ -0,0 +1,87 @@
+/*
+Copyright 2019 The Kubernetes 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 printers
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+type TestPrintType struct {
+	Data string
+}
+
+func (obj *TestPrintType) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }
+func (obj *TestPrintType) DeepCopyObject() runtime.Object {
+	if obj == nil {
+		return nil
+	}
+	clone := *obj
+	return &clone
+}
+
+func PrintCustomType(obj *TestPrintType, options GenerateOptions) ([]metav1beta1.TableRow, error) {
+	return []metav1beta1.TableRow{{Cells: []interface{}{obj.Data}}}, nil
+}
+
+func ErrorPrintHandler(obj *TestPrintType, options GenerateOptions) ([]metav1beta1.TableRow, error) {
+	return nil, fmt.Errorf("ErrorPrintHandler error")
+}
+
+func TestCustomTypePrinting(t *testing.T) {
+	columns := []metav1beta1.TableColumnDefinition{{Name: "Data"}}
+	generator := NewTableGenerator()
+	err := generator.TableHandler(columns, PrintCustomType)
+	if err != nil {
+		t.Fatalf("An error occurred when adds a print handler with a given set of columns: %#v", err)
+	}
+
+	obj := TestPrintType{"test object"}
+	table, err := generator.GenerateTable(&obj, GenerateOptions{})
+	if err != nil {
+		t.Fatalf("An error occurred generating the table for custom type: %#v", err)
+	}
+
+	expectedTable := &metav1.Table{
+		ColumnDefinitions: []metav1.TableColumnDefinition{{Name: "Data"}},
+		Rows:              []metav1.TableRow{{Cells: []interface{}{"test object"}}},
+	}
+	if !reflect.DeepEqual(expectedTable, table) {
+		t.Errorf("Error generating table from custom type. Expected (%#v), got (%#v)", expectedTable, table)
+	}
+}
+
+func TestPrintHandlerError(t *testing.T) {
+	columns := []metav1beta1.TableColumnDefinition{{Name: "Data"}}
+	generator := NewTableGenerator()
+	err := generator.TableHandler(columns, ErrorPrintHandler)
+	if err != nil {
+		t.Fatalf("An error occurred when adds a print handler with a given set of columns: %#v", err)
+	}
+
+	obj := TestPrintType{"test object"}
+	_, err = generator.GenerateTable(&obj, GenerateOptions{})
+	if err == nil || err.Error() != "ErrorPrintHandler error" {
+		t.Errorf("Did not get the expected error: %#v", err)
+	}
+}