github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubectl add job DESIRED column

Browse Source
This commit is contained in:
AdoHe 2016-02-25 10:43:04 -05:00
parent 9c1d8bf99d
commit aa6f07636b
2 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/kubectl/resource_printer.go
View File

@ -398,7 +398,7 @@ 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", "SUCCESSFUL"}
var jobColumns = []string{"NAME", "DESIRED", "SUCCESSFUL"}
var serviceColumns = []string{"NAME", "CLUSTER-IP", "EXTERNAL-IP", "PORT(S)", "AGE"}
var ingressColumns = []string{"NAME", "RULE", "BACKEND", "ADDRESS"}
var endpointColumns = []string{"NAME", "ENDPOINTS", "AGE"}
@ -838,12 +838,23 @@ func printJob(job *extensions.Job, w io.Writer, options PrintOptions) error {
}
selector, _ := unversioned.LabelSelectorAsSelector(job.Spec.Selector)
_, err := fmt.Fprintf(w, "%s\t%d",
if job.Spec.Completions != nil {
if _, err := fmt.Fprintf(w, "%s\t%d\t%d",
name,
job.Status.Succeeded)
if err != nil {
*job.Spec.Completions,
job.Status.Succeeded,
); err != nil {
return err
}
} else {
if _, err := fmt.Fprintf(w, "%s\t%s\t%d",
name,
"<none>",
job.Status.Succeeded,
); err != nil {
return err
}
}
if options.Wide {
if _, err := fmt.Fprintf(w, "\t%s\t%s\t%s",
firstContainer.Name,

48
pkg/kubectl/resource_printer_test.go
View File

@ -1340,6 +1340,54 @@ func TestPrintDaemonSet(t *testing.T) {
}
}
func TestPrintJob(t *testing.T) {
completions := 2
tests := []struct {
job extensions.Job
expect string
}{
{
extensions.Job{
ObjectMeta: api.ObjectMeta{
Name: "job1",
CreationTimestamp: unversioned.Time{Time: time.Now().Add(1.9e9)},
},
Spec: extensions.JobSpec{
Completions: &completions,
},
Status: extensions.JobStatus{
Succeeded: 1,
},
},
"job1\t2\t1\n",
},
{
extensions.Job{
ObjectMeta: api.ObjectMeta{
Name: "job2",
CreationTimestamp: unversioned.Time{Time: time.Now().Add(1.9e9)},
},
Spec: extensions.JobSpec{
Completions: nil,
},
Status: extensions.JobStatus{
Succeeded: 0,
},
},
"job2\t<none>\t0\n",
},
}
buf := bytes.NewBuffer([]byte{})
for _, test := range tests {
printJob(&test.job, buf, PrintOptions{false, false, false, true, false, false, []string{}})
if buf.String() != test.expect {
t.Fatalf("Expected: %s, got: %s", test.expect, buf.String())
}
buf.Reset()
}
}
func TestPrintPodShowLabels(t *testing.T) {
tests := []struct {
pod api.Pod