Merge pull request #517 from Iceber/fix_apiservices_table_0.6

[release/0.6] kubeapiserver: add the table convertor for apiservices

Author: Iceber

pkg/kubeapiserver/printers/apiservice_handler.go

@@ -0,0 +1,57 @@
+package printers
+
+import (
+	"fmt"
+
+	metatable "k8s.io/apimachinery/pkg/api/meta/table"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/kube-aggregator/pkg/apis/apiregistration"
+	"k8s.io/kubernetes/pkg/printers"
+)
+
+func AddAPIServiceHandler(h printers.PrintHandler) {
+	columnDefinitions := []metav1.TableColumnDefinition{
+		{Name: "Name", Type: "string", Format: "name", Description: swaggerMetadataDescriptions["name"]},
+		{Name: "Service", Type: "string", Description: "The reference to the service that hosts this API endpoint."},
+		{Name: "Available", Type: "string", Description: "Whether this service is available."},
+		{Name: "Age", Type: "string", Description: swaggerMetadataDescriptions["creationTimestamp"]},
+	}
+
+	_ = h.TableHandler(columnDefinitions, func(list *apiregistration.APIServiceList, options printers.GenerateOptions) ([]metav1.TableRow, error) {
+		return metatable.MetaToTableRow(list, apiServiceHandler)
+	})
+	_ = h.TableHandler(columnDefinitions, func(apiservice *apiregistration.APIService, options printers.GenerateOptions) ([]metav1.TableRow, error) {
+		return metatable.MetaToTableRow(apiservice, apiServiceHandler)
+	})
+}
+
+// k8s.io/kube-aggregator/pkg/registry/apiservice/etcd.(*REST).ConvertToTable
+func apiServiceHandler(obj runtime.Object, m metav1.Object, name, age string) ([]interface{}, error) {
+	svc := obj.(*apiregistration.APIService)
+	service := "Local"
+	if svc.Spec.Service != nil {
+		service = fmt.Sprintf("%s/%s", svc.Spec.Service.Namespace, svc.Spec.Service.Name)
+	}
+	status := string(apiregistration.ConditionUnknown)
+	if condition := getCondition(svc.Status.Conditions, "Available"); condition != nil {
+		switch {
+		case condition.Status == apiregistration.ConditionTrue:
+			status = string(condition.Status)
+		case len(condition.Reason) > 0:
+			status = fmt.Sprintf("%s (%s)", condition.Status, condition.Reason)
+		default:
+			status = string(condition.Status)
+		}
+	}
+	return []interface{}{name, service, status, age}, nil
+}
+
+func getCondition(conditions []apiregistration.APIServiceCondition, conditionType apiregistration.APIServiceConditionType) *apiregistration.APIServiceCondition {
+	for i, condition := range conditions {
+		if condition.Type == conditionType {
+			return &conditions[i]
+		}
+	}
+	return nil
+}

pkg/kubeapiserver/restmanager.go

@@ -480,5 +480,5 @@ func GetTableConvertor(gr schema.GroupResource) rest.TableConvertor {
 		return printers.NewDefaultTableConvertor(gr)
 	}
 
-	return printerstorage.TableConvertor{TableGenerator: printers.NewClusterTableGenerator().With(printersinternal.AddHandlers)}
+	return printerstorage.TableConvertor{TableGenerator: printers.NewClusterTableGenerator().With(printersinternal.AddHandlers, printers.AddAPIServiceHandler)}
 }

pkg/scheme/import_known_versions.go

@@ -3,6 +3,7 @@ package scheme
 import (
 	// These imports are the API groups the API server will support.
 	apiextensionsinstall "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install"
+	apiregistrationinstall "k8s.io/kube-aggregator/pkg/apis/apiregistration/install"
 	_ "k8s.io/kubernetes/pkg/apis/admission/install"
 	_ "k8s.io/kubernetes/pkg/apis/admissionregistration/install"
 	_ "k8s.io/kubernetes/pkg/apis/apiserverinternal/install"
@@ -29,4 +30,5 @@ import (
 
 func init() {
 	apiextensionsinstall.Install(LegacyResourceScheme)
+	apiregistrationinstall.Install(LegacyResourceScheme)
 }

vendor/k8s.io/apimachinery/pkg/api/meta/table/table.go

@@ -668,6 +668,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextension
 k8s.io/apimachinery/pkg/api/equality
 k8s.io/apimachinery/pkg/api/errors
 k8s.io/apimachinery/pkg/api/meta
+k8s.io/apimachinery/pkg/api/meta/table
 k8s.io/apimachinery/pkg/api/resource
 k8s.io/apimachinery/pkg/api/validation
 k8s.io/apimachinery/pkg/api/validation/path
@@ -1168,6 +1169,7 @@ k8s.io/klog/v2/internal/severity
 # k8s.io/kube-aggregator v0.0.0 => k8s.io/kube-aggregator v0.25.2
 ## explicit; go 1.19
 k8s.io/kube-aggregator/pkg/apis/apiregistration
+k8s.io/kube-aggregator/pkg/apis/apiregistration/install
 k8s.io/kube-aggregator/pkg/apis/apiregistration/v1
 k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/helper
 k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1