Merge pull request #22 from flyhope/6-custom-for-format-table-field

custom for format table field

Author: flyhope

comm/config.go

@@ -54,12 +54,17 @@ var ShowKubeteaConfig = sync.OnceValue(func() *KubeteaConfig {
 
 // KubeteaConfig YAML配置定义
 type KubeteaConfig struct {
-	PodCacheLivetime uint32            `yaml:"pod_cache_livetime_second"` // 缓存Pod过期时间，过期自动刷新
-	Log              KubeteaConfigLog  `yaml:"log"`                       // 日志配置
-	ClusterByLabel   string            `yaml:"cluster_by_label"`          // 筛选显示cluster的Label的名称
-	ClusterFilters   []string          `yaml:"cluster_filters"`           // 筛选显示cluster的Label的值，支持glob
-	Sort             KubeteaConfigSort `yaml:"sort"`                      // 自定义排序
-	Template         KubeteaTemplate   `yaml:"template"`                  // 显示模板定义
+	PodCacheLivetime uint32                                       `yaml:"pod_cache_livetime_second"` // 缓存Pod过期时间，过期自动刷新
+	Log              KubeteaConfigLog                             `yaml:"log"`                       // 日志配置
+	ClusterByLabel   string                                       `yaml:"cluster_by_label"`          // 筛选显示cluster的Label的名称
+	ClusterFilters   []string                                     `yaml:"cluster_filters"`           // 筛选显示cluster的Label的值，支持glob
+	Sort             KubeteaConfigSort                            `yaml:"sort"`                      // 自定义排序
+	Template         map[ConfigTemplateName]*KubeteaTemplateTable `yaml:"template"`                  // 显示模板定义
+}
+
+// ShowTemplateColumn 根据名称获取一个TableName
+func (k *KubeteaConfig) ShowTemplateColumn(name ConfigTemplateName) []table.Column {
+	return k.Template[name].Column
 }
 
 type KubeteaConfigLog struct {
@@ -71,12 +76,15 @@ type KubeteaConfigLog struct {
 type KubeteaConfigSort struct {
 	Container SortMap `yaml:"container"`
 }
-
-type KubeteaTemplate struct {
-	Pod KubeteaTemplateTable `yaml:"pod"`
-}
-
 type KubeteaTemplateTable struct {
 	Column []table.Column `yaml:"column"`
 	Body   []string       `yaml:"body"`
 }
+
+type ConfigTemplateName string
+
+const (
+	ConfigTemplateCluster   ConfigTemplateName = "cluster"
+	ConfigTemplatePod       ConfigTemplateName = "pod"
+	ConfigTemplateContainer ConfigTemplateName = "container"
+)

comm/kubetea.yaml

@@ -26,6 +26,14 @@ sort:
 
 # template view define
 template:
+  cluster:
+    column:
+      - { title: "集群", width: 0 }
+      - { title: "数量", width: 10 }
+    body:
+      # first cloume must be .Name
+      - "{{ .Name }}"
+      - "{{ len .Pods }}"
   pod:
     column:
       - { title: "名称", width: 0 }
@@ -40,4 +48,15 @@ template:
       - "{{ PodPhaseView . }}"
       - "{{ PodReadyView . }}"
       - "{{ if .Status.StartTime }}{{ FormatTime .Status.StartTime.Time }}{{else}}-{{end}}"
-
+  container:
+    column:
+      - { title: "容器名称", width: 0 }
+      - { title: "镜像地址", width: 0 }
+      - { title: "状态", width: 4 }
+      - { title: "就绪", width: 4 }
+    body:
+      # first cloume must be .Name
+      - "{{ .Name }}"
+      - "{{ .Image }}"
+      - "{{ ContainerStateView . }}"
+      - "{{ BoolView .Ready }}"

view/cluster.go

@@ -8,9 +8,9 @@ import (
 	"github.com/flyhope/kubetea/k8s"
 	"github.com/flyhope/kubetea/ui"
 	"github.com/sirupsen/logrus"
+	v1 "k8s.io/api/core/v1"
 	"path/filepath"
 	"sort"
-	"strconv"
 	"time"
 )
 
@@ -19,18 +19,24 @@ type clusterModel struct {
 	*ui.TableFilter
 }
 
+// 用于显示的集群每行数据
+type clusterRow struct {
+	Name    string
+	Pods    []*v1.Pod
+	SortNum int
+}
+
 // 更新数据
 func (c *clusterModel) updateData(force bool) {
 	config := comm.ShowKubeteaConfig()
-	groupLabels := make(map[string]int)
 
 	pods, err := k8s.PodCache().ShowList(force)
 	if err != nil {
 		return
 	}
 
 	// 获取要展示的label
-	labelTotal := make(map[string]int)
+	clusterRows := make(map[string]*clusterRow, len(config.ClusterFilters))
 	for _, pod := range pods.Items {
 		groupLabelValue := pod.Labels[config.ClusterByLabel]
 		for idx, filter := range config.ClusterFilters {
@@ -41,24 +47,31 @@ func (c *clusterModel) updateData(force bool) {
 			}
 
 			if ok {
-				groupLabels[groupLabelValue] = idx
-				labelTotal[groupLabelValue]++
+				row := clusterRows[groupLabelValue]
+				if row == nil {
+					row = &clusterRow{
+						Name:    groupLabelValue,
+						SortNum: idx,
+					}
+					clusterRows[groupLabelValue] = row
+				}
+				row.Pods = append(row.Pods, &pod)
 				break
 			}
 		}
 	}
 
 	// 拼接UI列表数据
-	rows := make([]table.Row, 0, len(groupLabels))
-	for label := range groupLabels {
-		rows = append(rows, table.Row{label, strconv.Itoa(labelTotal[label])})
+	rows := make([]table.Row, 0, len(clusterRows))
+	for _, row := range clusterRows {
+		rows = append(rows, TemplateRender(comm.ConfigTemplateCluster, row))
 	}
 
+	// 排序
 	sort.Slice(rows, func(i, j int) bool {
-		if groupLabels[rows[i][0]] != groupLabels[rows[j][0]] {
-			return groupLabels[rows[i][0]] < groupLabels[rows[j][0]]
+		if clusterRows[rows[i][0]].SortNum != clusterRows[rows[j][0]].SortNum {
+			return clusterRows[rows[i][0]].SortNum < clusterRows[rows[j][0]].SortNum
 		}
-
 		return rows[i][0] < rows[j][0]
 	})
 	c.Table.SetRows(rows)
@@ -71,10 +84,7 @@ func ShowCluster() (tea.Model, error) {
 	m := &clusterModel{
 		TableFilter: ui.NewTableFilter(),
 	}
-	m.TableFilter.Table = ui.NewTableWithData([]table.Column{
-		{Title: "集群", Width: 0},
-		{Title: "数量", Width: 10},
-	}, nil)
+	m.TableFilter.Table = ui.NewTableWithData(comm.ShowKubeteaConfig().ShowTemplateColumn(comm.ConfigTemplateCluster), nil)
 	m.updateData(false)
 
 	m.UpdateEvent = func(msg tea.Msg) (tea.Model, tea.Cmd) {
@@ -104,3 +114,13 @@ func ShowCluster() (tea.Model, error) {
 	}
 	return m, nil
 }
+
+// countByPodLabelKeyValue 根据Pod的Label标签，统计符合条件的POD的数量
+func countByPodLabelKeyValue(pods []*v1.Pod, key, value string) (result int) {
+	for _, pod := range pods {
+		if pod.Labels[key] == value {
+			result++
+		}
+	}
+	return result
+}

view/container.go

@@ -30,24 +30,14 @@ func (m *containerModel) updateData(force bool) {
 	// 获取 container
 	rows := make([]table.Row, 0, len(pod.Status.ContainerStatuses))
 	for _, container := range pod.Status.ContainerStatuses {
-		rows = append(rows, table.Row{
-			container.Name,
-			container.Image,
-			getContainerState(container),
-			getBoolString(container.Ready),
-		})
+		rows = append(rows, TemplateRender(comm.ConfigTemplateContainer, container))
 	}
 	ui.TableRowsSort(rows, comm.ShowKubeteaConfig().Sort.Container)
 
 	// 展示 init container
 	initRows := make([]table.Row, 0, len(pod.Status.InitContainerStatuses))
 	for _, container := range pod.Status.InitContainerStatuses {
-		initRows = append(initRows, table.Row{
-			container.Name,
-			container.Image,
-			getContainerState(container),
-			getBoolString(container.Ready),
-		})
+		initRows = append(initRows, TemplateRender(comm.ConfigTemplateContainer, container))
 	}
 	ui.TableRowsSort(initRows, comm.ShowKubeteaConfig().Sort.Container)
 	rows = append(rows, initRows...)
@@ -68,12 +58,7 @@ func ShowContainer(podName string, lastModel tea.Model) (tea.Model, error) {
 	}
 	m.Abstract.Model = m
 
-	m.Table = ui.NewTableWithData([]table.Column{
-		{Title: "容器名称", Width: 0},
-		{Title: "镜像地址", Width: 0},
-		{Title: "状态", Width: 4},
-		{Title: "就绪", Width: 4},
-	}, nil)
+	m.Table = ui.NewTableWithData(comm.ShowKubeteaConfig().ShowTemplateColumn(comm.ConfigTemplateContainer), nil)
 	m.updateData(false)
 
 	m.UpdateEvent = func(msg tea.Msg) (tea.Model, tea.Cmd) {
@@ -134,16 +119,8 @@ func ShowContainer(podName string, lastModel tea.Model) (tea.Model, error) {
 
 }
 
-// 获取字符串输出的Bool值
-func getBoolString(val bool) string {
-	if val {
-		return "✔️"
-	}
-	return "❌️"
-}
-
 // 获取容器的状态名称
-func getContainerState(status v1.ContainerStatus) string {
+func containerStateView(status v1.ContainerStatus) string {
 	if status.State.Waiting != nil {
 		return "♾️"
 	} else if status.State.Terminated != nil {

view/pod.go

@@ -1,15 +1,13 @@
 package view
 
 import (
-	"bytes"
 	"fmt"
 	"github.com/charmbracelet/bubbles/table"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/flyhope/kubetea/comm"
 	"github.com/flyhope/kubetea/k8s"
 	"github.com/flyhope/kubetea/ui"
 	"github.com/sirupsen/logrus"
-	"html/template"
 	v1 "k8s.io/api/core/v1"
 	"sort"
 	"time"
@@ -19,8 +17,7 @@ import (
 type podModel struct {
 	ui.Abstract
 	*ui.TableFilter
-	app       string
-	templates []*template.Template
+	app string
 }
 
 // 更新数据
@@ -31,39 +28,16 @@ func (c *podModel) updateData(force bool) {
 		return
 	}
 
-	rows := make([]table.Row, 0)
+	rows := make([]table.Row, 0, len(pods.Items))
 	for _, pod := range pods.Items {
 		if pod.Labels["app"] == c.app {
-
-			row := make(table.Row, 0, len(c.templates))
-			for _, tmpl := range c.templates {
-				var buf bytes.Buffer
-				if errExecute := tmpl.Execute(&buf, pod); errExecute != nil {
-					logrus.Warnln(errExecute)
-				}
-				row = append(row, buf.String())
-			}
-			rows = append(rows, row)
+			rows = append(rows, TemplateRender(comm.ConfigTemplatePod, pod))
 
 			//name := pod.Name
 			////if strings.Index(name, app) == 0 {
 			////	name = name[len(app):]
 			////	name = strings.TrimLeft(name, "-_.")
 			////}
-			//
-			//// 格式化时间输出
-			//timeStr := "-"
-			//if startTime := pod.Status.StartTime; startTime != nil {
-			//	timeStr = startTime.Format(time.DateTime)
-			//}
-			//
-			//rows = append(rows, table.Row{
-			//	name,
-			//	pod.Status.PodIP,
-			//	PodPhaseView(pod),
-			//	PodReadyView(pod),
-			//	timeStr,
-			//})
 		}
 	}
 
@@ -80,21 +54,16 @@ func (c *podModel) updateData(force bool) {
 
 // ShowPod 获取POD列表
 func ShowPod(app string, lastModel tea.Model) (tea.Model, error) {
-	templates, errTmpl := NewTmplParseSlice(comm.ShowKubeteaConfig().Template.Pod.Body)
-	if errTmpl != nil {
-		return nil, errTmpl
-	}
 
 	// 渲染UI
 	m := &podModel{
 		Abstract:    ui.Abstract{LastModel: lastModel},
 		TableFilter: ui.NewTableFilter(),
 		app:         app,
-		templates:   templates,
 	}
 	m.Abstract.Model = m
 
-	m.TableFilter.Table = ui.NewTableWithData(comm.ShowKubeteaConfig().Template.Pod.Column, nil)
+	m.TableFilter.Table = ui.NewTableWithData(comm.ShowKubeteaConfig().ShowTemplateColumn(comm.ConfigTemplatePod), nil)
 	m.TableFilter.Focus()
 	m.updateData(false)
 
@@ -154,8 +123,8 @@ var phaseAlias = map[v1.PodPhase]string{
 	"Terminating":   "✴️",
 }
 
-// PodPhaseView 友好显示POD状态
-func PodPhaseView(pod v1.Pod) string {
+// podPhaseView 友好显示POD状态
+func podPhaseView(pod v1.Pod) string {
 	phase := pod.Status.Phase
 	if pod.DeletionTimestamp != nil {
 		phase = "Terminating"
@@ -168,8 +137,8 @@ func PodPhaseView(pod v1.Pod) string {
 	return result
 }
 
-// PodReadyView 友好显示POD的Ready状态
-func PodReadyView(pod v1.Pod) string {
+// podReadyView 友好显示POD的Ready状态
+func podReadyView(pod v1.Pod) string {
 	for _, condition := range pod.Status.Conditions {
 		if condition.Type == v1.PodReady && condition.Status == v1.ConditionTrue {
 			return "✔️"