Merge pull request #38 from flyhope/37-show-pod-name-on-container-list

show pod name on container list

Author: flyhope

comm/kubetea.yaml

@@ -45,25 +45,27 @@ template:
     column:
       - { title: '{{ txt "name" }}', width: 0 }
       - { title: 'IP', width: 15 }
+      - { title: '{{ txt "createdAt" }}', width: 19 }
       - { title: '{{ txt "status" }}', width: 4 }
       - { title: '{{ txt "ready" }}', width: 4 }
-      - { title: '{{ txt "createdAt" }}', width: 19 }
     body:
       # first cloume must be .Name
       - "{{ .Name }}"
       - "{{ .Status.PodIP }}"
+      - "{{ if .Status.StartTime }}{{ FormatTime .Status.StartTime.Time }}{{else}}-{{end}}"
       - "{{ PodPhaseView . }}"
       - "{{ PodReadyView . }}"
-      - "{{ if .Status.StartTime }}{{ FormatTime .Status.StartTime.Time }}{{else}}-{{end}}"
   container:
     column:
       - { title: '{{ txt "containerName" }}', width: 0 }
       - { title: '{{ txt "imageUrl" }}', width: 0 }
+      - { title: '{{ txt "createdAt" }}', width: 19 }
       - { title: '{{ txt "status" }}', width: 4 }
-      - { title: '{{ txt "createdAt" }}', width: 4 }
+      - { title: '{{ txt "ready" }}', width: 4 }
     body:
       # first cloume must be .Name
       - "{{ .Name }}"
       - "{{ .Image }}"
+      - "{{ if .State.Running }}{{ FormatTime .State.Running.StartedAt.Time }}{{else}}-{{end}}"
       - "{{ ContainerStateView . }}"
       - "{{ BoolView .Ready }}"

view/container.go

@@ -44,6 +44,7 @@ func (m *containerModel) updateData(force bool) {
 
 	m.Table.SetRows(rows)
 	m.SubDescs = []string{
+		pod.Name,
 		lang.Data(langTotalWithNumber, lang.Map{"number": len(rows)}),
 		lang.Data(langUpdateTime, lang.Map{"UpdateTime": lastUpdate.Format(time.DateTime)}),
 	}