github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22141 from AdoHe/kubectl_add_age_column

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-28 13:09:59 -08:00
commit 13f6daf980
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/kubectl/resource_printer.go
View File

@ -398,12 +398,12 @@ var podColumns = []string{"NAME", "READY", "STATUS", "RESTARTS", "AGE"}
var podTemplateColumns = []string{"TEMPLATE", "CONTAINER(S)", "IMAGE(S)", "PODLABELS"}
var replicationControllerColumns = []string{"NAME", "DESIRED", "CURRENT", "AGE"}
var replicaSetColumns = []string{"NAME", "DESIRED", "CURRENT", "AGE"}
var jobColumns = []string{"NAME", "DESIRED", "SUCCESSFUL"}
var jobColumns = []string{"NAME", "DESIRED", "SUCCESSFUL", "AGE"}
var serviceColumns = []string{"NAME", "CLUSTER-IP", "EXTERNAL-IP", "PORT(S)", "AGE"}
var ingressColumns = []string{"NAME", "RULE", "BACKEND", "ADDRESS"}
var ingressColumns = []string{"NAME", "RULE", "BACKEND", "ADDRESS", "AGE"}
var endpointColumns = []string{"NAME", "ENDPOINTS", "AGE"}
var nodeColumns = []string{"NAME", "STATUS", "AGE"}
var daemonSetColumns = []string{"NAME", "DESIRED", "CURRENT", "NODE-SELECTOR"}
var daemonSetColumns = []string{"NAME", "DESIRED", "CURRENT", "NODE-SELECTOR", "AGE"}
var eventColumns = []string{"FIRSTSEEN", "LASTSEEN", "COUNT", "NAME", "KIND", "SUBOBJECT", "TYPE", "REASON", "SOURCE", "MESSAGE"}
var limitRangeColumns = []string{"NAME", "AGE"}
var resourceQuotaColumns = []string{"NAME", "AGE"}
@ -839,18 +839,20 @@ func printJob(job *extensions.Job, w io.Writer, options PrintOptions) error {
selector, _ := unversioned.LabelSelectorAsSelector(job.Spec.Selector)
if job.Spec.Completions != nil {
if _, err := fmt.Fprintf(w, "%s\t%d\t%d",
if _, err := fmt.Fprintf(w, "%s\t%d\t%d\t%s",
name,
*job.Spec.Completions,
job.Status.Succeeded,
translateTimestamp(job.CreationTimestamp),
); err != nil {
return err
}
} else {
if _, err := fmt.Fprintf(w, "%s\t%s\t%d",
if _, err := fmt.Fprintf(w, "%s\t%s\t%d\t%s",
name,
"<none>",
job.Status.Succeeded,
translateTimestamp(job.CreationTimestamp),
); err != nil {
return err
}
@ -1002,11 +1004,13 @@ func printIngress(ingress *extensions.Ingress, w io.Writer, options PrintOptions
}
}
if _, err := fmt.Fprintf(w, "%s\t%v\t%v\t%v",
if _, err := fmt.Fprintf(w, "%s\t%v\t%v\t%v\t%s",
name,
"-",
backendStringer(ingress.Spec.Backend),
loadBalancerStatusStringer(ingress.Status.LoadBalancer)); err != nil {
loadBalancerStatusStringer(ingress.Status.LoadBalancer),
translateTimestamp(ingress.CreationTimestamp),
); err != nil {
return err
}
if _, err := fmt.Fprint(w, appendLabels(ingress.Labels, options.ColumnLabels)); err != nil {
@ -1078,11 +1082,12 @@ func printDaemonSet(ds *extensions.DaemonSet, w io.Writer, options PrintOptions)
// this shouldn't happen if LabelSelector passed validation
return err
}
if _, err := fmt.Fprintf(w, "%s\t%d\t%d\t%s",
if _, err := fmt.Fprintf(w, "%s\t%d\t%d\t%s\t%s",
name,
desiredScheduled,
currentScheduled,
labels.FormatLabels(ds.Spec.Template.Spec.NodeSelector),
translateTimestamp(ds.CreationTimestamp),
); err != nil {
return err
}

8
pkg/kubectl/resource_printer_test.go
View File

@ -1326,7 +1326,7 @@ func TestPrintDaemonSet(t *testing.T) {
DesiredNumberScheduled: 3,
},
},
"test1\t3\t2\t<none>\n",
"test1\t3\t2\t<none>\t0s\n",
},
}
@ -1359,13 +1359,13 @@ func TestPrintJob(t *testing.T) {
Succeeded: 1,
},
},
"job1\t2\t1\n",
"job1\t2\t1\t0s\n",
},
{
extensions.Job{
ObjectMeta: api.ObjectMeta{
Name: "job2",
CreationTimestamp: unversioned.Time{Time: time.Now().Add(1.9e9)},
CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)},
},
Spec: extensions.JobSpec{
Completions: nil,
@ -1374,7 +1374,7 @@ func TestPrintJob(t *testing.T) {
Succeeded: 0,
},
},
"job2\t<none>\t0\n",
"job2\t<none>\t0\t10y\n",
},
}