Use version and additional columns for crds (#530)

stashed · Jul 11, 2018 · f7976e7 · f7976e7
1 parent f3ec9a1
commit f7976e7
Show file tree

Hide file tree

Showing 5 changed files with 179 additions and 41 deletions.
diff --git a/apis/stash/v1alpha1/crd.go b/apis/stash/v1alpha1/crd.go
@@ -12,56 +12,147 @@ var (
 func (c Restic) CustomResourceDefinition() *apiextensions.CustomResourceDefinition {
 	return crdutils.NewCustomResourceDefinition(crdutils.Config{
 		Group:         SchemeGroupVersion.Group,
-		Version:       SchemeGroupVersion.Version,
 		Plural:        ResourcePluralRestic,
 		Singular:      ResourceSingularRestic,
 		Kind:          ResourceKindRestic,
 		ShortNames:    []string{"rst"},
 		ResourceScope: string(apiextensions.NamespaceScoped),
+		Versions: []apiextensions.CustomResourceDefinitionVersion{
+			{
+				Name:    SchemeGroupVersion.Version,
+				Served:  true,
+				Storage: true,
+			},
+		},
 		Labels: crdutils.Labels{
 			LabelsMap: map[string]string{"app": "stash"},
 		},
 		SpecDefinitionName:      "github.com/appscode/stash/apis/stash/v1alpha1.Restic",
 		EnableValidation:        true,
 		GetOpenAPIDefinitions:   GetOpenAPIDefinitions,
 		EnableStatusSubresource: EnableStatusSubresource,
+		AdditionalPrinterColumns: []apiextensions.CustomResourceColumnDefinition{
+			{
+				Name:     "Selector",
+				Type:     "string",
+				JSONPath: ".spec.selector",
+			},
+			{
+				Name:     "Schedule",
+				Type:     "string",
+				JSONPath: ".spec.schedule",
+			},
+			{
+				Name:     "BackupType",
+				Type:     "string",
+				JSONPath: ".spec.type",
+				Priority: 10,
+			},
+			{
+				Name:     "Paused",
+				Type:     "boolean",
+				JSONPath: ".spec.paused",
+			},
+			{
+				Name:     "Age",
+				Type:     "date",
+				JSONPath: ".metadata.creationTimestamp",
+			},
+		},
 	})
 }
 
 func (c Recovery) CustomResourceDefinition() *apiextensions.CustomResourceDefinition {
 	return crdutils.NewCustomResourceDefinition(crdutils.Config{
 		Group:         SchemeGroupVersion.Group,
-		Version:       SchemeGroupVersion.Version,
 		Plural:        ResourcePluralRecovery,
 		Singular:      ResourceSingularRecovery,
 		Kind:          ResourceKindRecovery,
 		ShortNames:    []string{"rec"},
 		ResourceScope: string(apiextensions.NamespaceScoped),
+		Versions: []apiextensions.CustomResourceDefinitionVersion{
+			{
+				Name:    SchemeGroupVersion.Version,
+				Served:  true,
+				Storage: true,
+			},
+		},
 		Labels: crdutils.Labels{
 			LabelsMap: map[string]string{"app": "stash"},
 		},
 		SpecDefinitionName:      "github.com/appscode/stash/apis/stash/v1alpha1.Recovery",
 		EnableValidation:        true,
 		GetOpenAPIDefinitions:   GetOpenAPIDefinitions,
 		EnableStatusSubresource: EnableStatusSubresource,
+		AdditionalPrinterColumns: []apiextensions.CustomResourceColumnDefinition{
+			{
+				Name:     "RepositoryNamespace",
+				Type:     "string",
+				JSONPath: ".spec.repository.namespace",
+			},
+			{
+				Name:     "RepositoryName",
+				Type:     "string",
+				JSONPath: ".spec.repository.name",
+			},
+			{
+				Name:     "Snapshot",
+				Type:     "string",
+				JSONPath: ".spec.snapshot",
+			},
+			{
+				Name:     "Phase",
+				Type:     "string",
+				JSONPath: ".status.phase",
+			},
+			{
+				Name:     "Age",
+				Type:     "date",
+				JSONPath: ".metadata.creationTimestamp",
+			},
+		},
 	})
 }
 
 func (c Repository) CustomResourceDefinition() *apiextensions.CustomResourceDefinition {
 	return crdutils.NewCustomResourceDefinition(crdutils.Config{
 		Group:         SchemeGroupVersion.Group,
-		Version:       SchemeGroupVersion.Version,
 		Plural:        ResourcePluralRepository,
 		Singular:      ResourceSingularRepository,
 		Kind:          ResourceKindRepository,
 		ShortNames:    []string{"repo"},
 		ResourceScope: string(apiextensions.NamespaceScoped),
+		Versions: []apiextensions.CustomResourceDefinitionVersion{
+			{
+				Name:    SchemeGroupVersion.Version,
+				Served:  true,
+				Storage: true,
+			},
+		},
 		Labels: crdutils.Labels{
 			LabelsMap: map[string]string{"app": "stash"},
 		},
 		SpecDefinitionName:      "github.com/appscode/stash/apis/stash/v1alpha1.Repository",
 		EnableValidation:        true,
 		GetOpenAPIDefinitions:   GetOpenAPIDefinitions,
 		EnableStatusSubresource: EnableStatusSubresource,
+		AdditionalPrinterColumns: []apiextensions.CustomResourceColumnDefinition{
+			{
+				Name:     "BackupCount",
+				Type:     "integer",
+				JSONPath: ".status.backupCount",
+			},
+			{
+				Name:     "LastSuccessfulBackup",
+				Type:     "date",
+				JSONPath: ".status.lastSuccessfulBackupTime",
+				Format:   "date-time",
+			},
+			{
+				Name:     "Age",
+				Type:     "date",
+				JSONPath: ".metadata.creationTimestamp",
+			},
+		},
 	})
 }
diff --git a/apis/stash/v1alpha1/crds.yaml b/apis/stash/v1alpha1/crds.yaml
@@ -7,6 +7,23 @@ metadata:
     app: stash
   name: restics.stash.appscode.com
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .spec.selector
+    name: Selector
+    type: string
+  - JSONPath: .spec.schedule
+    name: Schedule
+    type: string
+  - JSONPath: .spec.type
+    name: BackupType
+    priority: 10
+    type: string
+  - JSONPath: .spec.paused
+    name: Paused
+    type: boolean
+  - JSONPath: .metadata.creationTimestamp
+    name: Age
+    type: date
   group: stash.appscode.com
   names:
     kind: Restic
@@ -1564,6 +1581,10 @@ spec:
                 - mountPath
               type: array
   version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -1573,6 +1594,22 @@ metadata:
     app: stash
   name: recoveries.stash.appscode.com
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .spec.repository.namespace
+    name: RepositoryNamespace
+    type: string
+  - JSONPath: .spec.repository.name
+    name: RepositoryName
+    type: string
+  - JSONPath: .spec.snapshot
+    name: Snapshot
+    type: string
+  - JSONPath: .status.phase
+    name: Phase
+    type: string
+  - JSONPath: .metadata.creationTimestamp
+    name: Age
+    type: date
   group: stash.appscode.com
   names:
     kind: Recovery
@@ -2996,6 +3033,10 @@ spec:
                     type: string
               type: array
   version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -3005,6 +3046,17 @@ metadata:
     app: stash
   name: repositories.stash.appscode.com
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.backupCount
+    name: BackupCount
+    type: integer
+  - JSONPath: .status.lastSuccessfulBackupTime
+    format: date-time
+    name: LastSuccessfulBackup
+    type: date
+  - JSONPath: .metadata.creationTimestamp
+    name: Age
+    type: date
   group: stash.appscode.com
   names:
     kind: Repository
@@ -4424,3 +4476,7 @@ spec:
               format: date-time
               type: string
   version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
diff --git a/glide.lock b/glide.lock
diff --git a/vendor/github.com/appscode/kutil/apiextensions/v1beta1/cli-utils.go b/vendor/github.com/appscode/kutil/apiextensions/v1beta1/cli-utils.go
diff --git a/vendor/github.com/appscode/kutil/openapi/render.go b/vendor/github.com/appscode/kutil/openapi/render.go