Add missing default columns for CRDs

Author: tomleb

pkg/schema/converter/crd.go

@@ -72,9 +72,29 @@ func forVersion(group, kind string, version v1.CustomResourceDefinitionVersion,
 		return
 	}
 	attributes.MarkCRD(schema)
-	if len(versionColumns) > 0 {
-		attributes.SetColumns(schema, versionColumns)
+	defaultColumns := []table.Column{
+		{
+			Name:   "Name",
+			Type:   "string",
+			Format: "name",
+			// Not setting description here because we don't set it above, might want to revisit
+			Description: "",
+			Priority:    0,
+			Field:       ".metadata.name",
+		},
+	}
+	if len(versionColumns) == 0 {
+		defaultColumns = append(defaultColumns, table.Column{
+			Name:   "Age",
+			Type:   "date",
+			Format: "",
+			// Not setting description here because we don't set it above, might want to revisit
+			Description: "",
+			Priority:    0,
+			Field:       ".metadata.creationTimestamp",
+		})
 	}
+	attributes.SetColumns(schema, append(defaultColumns, versionColumns...))
 	if version.Schema != nil && version.Schema.OpenAPIV3Schema != nil {
 		schema.Description = version.Schema.OpenAPIV3Schema.Description
 

pkg/schema/converter/crd_test.go

@@ -169,6 +169,12 @@ func TestAddCustomResources(t *testing.T) {
 						Attributes: map[string]interface{}{
 							"crd": true,
 							"columns": []table.Column{
+								{
+									Name:   "Name",
+									Field:  ".metadata.name",
+									Type:   "string",
+									Format: "name",
+								},
 								{
 									Name:   "TestColumn",
 									Field:  "TestPath",

pkg/schema/converter/k8stonorman_test.go

@@ -168,6 +168,12 @@ func TestToSchemas(t *testing.T) {
 							"verbs":      []string{"get"},
 							"namespaced": true,
 							"columns": []table.Column{
+								{
+									Name:   "Name",
+									Field:  ".metadata.name",
+									Type:   "string",
+									Format: "name",
+								},
 								{
 									Name:   "TestColumn",
 									Field:  "TestPath",

tests/integration/testdata/columns/scenario1.test.yaml

@@ -10,7 +10,7 @@ tests:
   - [bar, foo, $skip, $duration]
 - schemaID: timestamps.cattle.io.dates
   expected:
-  - [the-date, $skip, $skip, $duration, $skip, $duration, $skip]
+  - [the-date, $duration, $duration, $duration, $timestamp, $duration, $timestamp]
 - schemaID: events
   query: filter=metadata.name=event-1
   expected: