github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 03:33:56 +00:00
Code Issues Projects Releases Wiki Activity

add age column for storageclass and cronjob test

Browse Source
This commit is contained in:
zhengjiajin 2017-09-15 17:55:40 +08:00
parent 6c84274113
commit f755759997
2 changed files with 116 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/printers/internalversion/printers.go
View File

@ -411,6 +411,7 @@ func AddHandlers(h printers.PrintHandler) {
storageClassColumnDefinitions := []metav1alpha1.TableColumnDefinition{
{Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]},
{Name: "Provisioner", Type: "string", Description: storagev1.StorageClass{}.SwaggerDoc()["provisioner"]},
{Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]},
}
h.TableHandler(storageClassColumnDefinitions, printStorageClass)
@ -1707,7 +1708,7 @@ func printStorageClass(obj *storage.StorageClass, options printers.PrintOptions)
name += " (default)"
}
provtype := obj.Provisioner
row.Cells = append(row.Cells, name, provtype)
row.Cells = append(row.Cells, name, provtype, translateTimestamp(obj.CreationTimestamp))
return []metav1alpha1.TableRow{row}, nil
}

114
pkg/printers/internalversion/printers_test.go
View File

@ -48,6 +48,7 @@ import (
"k8s.io/kubernetes/pkg/apis/batch"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/apis/policy"
"k8s.io/kubernetes/pkg/apis/storage"
kubectltesting "k8s.io/kubernetes/pkg/kubectl/testing"
"k8s.io/kubernetes/pkg/printers"
)
@ -3017,3 +3018,116 @@ func TestPrintPersistentVolumeClaim(t *testing.T) {
buf.Reset()
}
}
func TestPrintCronJob(t *testing.T) {
suspend := false
tests := []struct {
cronjob batch.CronJob
expect string
}{
{
batch.CronJob{
ObjectMeta: metav1.ObjectMeta{
Name: "cronjob1",
CreationTimestamp: metav1.Time{Time: time.Now().Add(1.9e9)},
},
Spec: batch.CronJobSpec{
Schedule: "0/5 * * * ?",
Suspend: &suspend,
},
Status: batch.CronJobStatus{
LastScheduleTime: &metav1.Time{Time: time.Now().Add(1.9e9)},
},
},
"cronjob1\t0/5 * * * ?\tFalse\t0\t0s\t0s\n",
},
{
batch.CronJob{
ObjectMeta: metav1.ObjectMeta{
Name: "cronjob2",
CreationTimestamp: metav1.Time{Time: time.Now().Add(-3e11)},
},
Spec: batch.CronJobSpec{
Schedule: "0/5 * * * ?",
Suspend: &suspend,
},
Status: batch.CronJobStatus{
LastScheduleTime: &metav1.Time{Time: time.Now().Add(-3e10)},
},
},
"cronjob2\t0/5 * * * ?\tFalse\t0\t30s\t5m\n",
},
{
batch.CronJob{
ObjectMeta: metav1.ObjectMeta{
Name: "cronjob3",
CreationTimestamp: metav1.Time{Time: time.Now().Add(-3e11)},
},
Spec: batch.CronJobSpec{
Schedule: "0/5 * * * ?",
Suspend: &suspend,
},
Status: batch.CronJobStatus{},
},
"cronjob3\t0/5 * * * ?\tFalse\t0\t<none>\t5m\n",
},
}
buf := bytes.NewBuffer([]byte{})
for _, test := range tests {
table, err := printers.NewTablePrinter().With(AddHandlers).PrintTable(&test.cronjob, printers.PrintOptions{})
if err != nil {
t.Fatal(err)
}
if err := printers.PrintTable(table, buf, printers.PrintOptions{NoHeaders: true}); err != nil {
t.Fatal(err)
}
if buf.String() != test.expect {
t.Fatalf("Expected: %s, got: %s", test.expect, buf.String())
}
buf.Reset()
}
}
func TestPrintStorageClass(t *testing.T) {
tests := []struct {
sc storage.StorageClass
expect string
}{
{
storage.StorageClass{
ObjectMeta: metav1.ObjectMeta{
Name: "sc1",
CreationTimestamp: metav1.Time{Time: time.Now().Add(1.9e9)},
},
Provisioner: "kubernetes.io/glusterfs",
},
"sc1\tkubernetes.io/glusterfs\t0s\n",
},
{
storage.StorageClass{
ObjectMeta: metav1.ObjectMeta{
Name: "sc2",
CreationTimestamp: metav1.Time{Time: time.Now().Add(-3e11)},
},
Provisioner: "kubernetes.io/nfs",
},
"sc2\tkubernetes.io/nfs\t5m\n",
},
}
buf := bytes.NewBuffer([]byte{})
for _, test := range tests {
table, err := printers.NewTablePrinter().With(AddHandlers).PrintTable(&test.sc, printers.PrintOptions{})
if err != nil {
t.Fatal(err)
}
if err := printers.PrintTable(table, buf, printers.PrintOptions{NoHeaders: true}); err != nil {
t.Fatal(err)
}
if buf.String() != test.expect {
t.Fatalf("Expected: %s, got: %s", test.expect, buf.String())
}
buf.Reset()
}
}