Add table printer for cluster

This commit is contained in:
Haoran Wang 2017-07-28 14:50:05 +08:00
parent 241f30b969
commit cd91fc53cd

View File

@ -68,7 +68,6 @@ var (
clusterRoleBindingWideColumns = []string{"ROLE", "USERS", "GROUPS", "SERVICEACCOUNTS"} clusterRoleBindingWideColumns = []string{"ROLE", "USERS", "GROUPS", "SERVICEACCOUNTS"}
storageClassColumns = []string{"NAME", "PROVISIONER"} storageClassColumns = []string{"NAME", "PROVISIONER"}
statusColumns = []string{"STATUS", "REASON", "MESSAGE"} statusColumns = []string{"STATUS", "REASON", "MESSAGE"}
clusterColumns = []string{"NAME", "STATUS", "AGE"}
networkPolicyColumns = []string{"NAME", "POD-SELECTOR", "AGE"} networkPolicyColumns = []string{"NAME", "POD-SELECTOR", "AGE"}
certificateSigningRequestColumns = []string{"NAME", "AGE", "REQUESTOR", "CONDITION"} certificateSigningRequestColumns = []string{"NAME", "AGE", "REQUESTOR", "CONDITION"}
podPresetColumns = []string{"NAME", "AGE"} podPresetColumns = []string{"NAME", "AGE"}
@ -363,8 +362,15 @@ func AddHandlers(h printers.PrintHandler) {
} }
h.TableHandler(podSecurityPolicyColumnDefinitions, printPodSecurityPolicy) h.TableHandler(podSecurityPolicyColumnDefinitions, printPodSecurityPolicy)
h.TableHandler(podSecurityPolicyColumnDefinitions, printPodSecurityPolicyList) h.TableHandler(podSecurityPolicyColumnDefinitions, printPodSecurityPolicyList)
h.Handler(clusterColumns, nil, printCluster)
h.Handler(clusterColumns, nil, printClusterList) clusterColumnDefinitions := []metav1alpha1.TableColumnDefinition{
{Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]},
{Name: "Status", Description: "Status of the cluster"},
{Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]},
}
h.TableHandler(clusterColumnDefinitions, printCluster)
h.TableHandler(clusterColumnDefinitions, printClusterList)
h.Handler(networkPolicyColumns, nil, printExtensionsNetworkPolicy) h.Handler(networkPolicyColumns, nil, printExtensionsNetworkPolicy)
h.Handler(networkPolicyColumns, nil, printExtensionsNetworkPolicyList) h.Handler(networkPolicyColumns, nil, printExtensionsNetworkPolicyList)
h.Handler(networkPolicyColumns, nil, printNetworkPolicy) h.Handler(networkPolicyColumns, nil, printNetworkPolicy)
@ -694,11 +700,13 @@ func printReplicaSetList(list *extensions.ReplicaSetList, options printers.Print
return rows, nil return rows, nil
} }
func printCluster(c *federation.Cluster, w io.Writer, options printers.PrintOptions) error { func printCluster(obj *federation.Cluster, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) {
name := printers.FormatResourceName(options.Kind, c.Name, options.WithKind) row := metav1alpha1.TableRow{
Object: runtime.RawExtension{Object: obj},
}
var statuses []string var statuses []string
for _, condition := range c.Status.Conditions { for _, condition := range obj.Status.Conditions {
if condition.Status == api.ConditionTrue { if condition.Status == api.ConditionTrue {
statuses = append(statuses, string(condition.Type)) statuses = append(statuses, string(condition.Type))
} else { } else {
@ -708,23 +716,20 @@ func printCluster(c *federation.Cluster, w io.Writer, options printers.PrintOpti
if len(statuses) == 0 { if len(statuses) == 0 {
statuses = append(statuses, "Unknown") statuses = append(statuses, "Unknown")
} }
row.Cells = append(row.Cells, obj.Name, strings.Join(statuses, ","), translateTimestamp(obj.CreationTimestamp))
return []metav1alpha1.TableRow{row}, nil
}
if _, err := fmt.Fprintf(w, "%s\t%s\t%s\n", func printClusterList(list *federation.ClusterList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) {
name, rows := make([]metav1alpha1.TableRow, 0, len(list.Items))
strings.Join(statuses, ","), for i := range list.Items {
translateTimestamp(c.CreationTimestamp), r, err := printCluster(&list.Items[i], options)
); err != nil { if err != nil {
return err return nil, err
} }
return nil rows = append(rows, r...)
} }
func printClusterList(list *federation.ClusterList, w io.Writer, options printers.PrintOptions) error { return rows, nil
for _, rs := range list.Items {
if err := printCluster(&rs, w, options); err != nil {
return err
}
}
return nil
} }
func printJob(obj *batch.Job, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) { func printJob(obj *batch.Job, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) {