From 04486f89bb05b0c385b19c696a12cac8ac41528a Mon Sep 17 00:00:00 2001 From: yangsoon Date: Thu, 1 Apr 2021 11:51:43 +0800 Subject: [PATCH] fix crd: add additional print column and short Name for CRD (#1377) * add additional print column * add shortname * fix printcolumn & test --- .../v1alpha2/application_types.go | 8 +++- .../v1alpha2/applicationrevision_types.go | 3 +- .../core.oam.dev/v1alpha2/approllout_types.go | 8 +++- .../v1alpha2/componentdefinition_types.go | 5 ++- apis/core.oam.dev/v1alpha2/core_types.go | 11 +++-- .../v1beta1/appdeployment_types.go | 2 +- .../core.oam.dev/v1beta1/application_types.go | 7 +++ .../v1beta1/applicationrevision_types.go | 2 + apis/core.oam.dev/v1beta1/approllout_types.go | 8 +++- .../v1beta1/componentdefinition_types.go | 5 ++- apis/core.oam.dev/v1beta1/core_types.go | 12 +++-- .../crds/core.oam.dev_appdeployments.yaml | 2 + .../core.oam.dev_applicationrevisions.yaml | 19 +++++++- .../crds/core.oam.dev_applications.yaml | 44 +++++++++++++++++- .../crds/core.oam.dev_approllouts.yaml | 45 ++++++++++++++++++- .../core.oam.dev_componentdefinitions.yaml | 26 ++++++++++- .../crds/core.oam.dev_traitdefinitions.yaml | 22 +++++++-- .../core.oam.dev_workloaddefinitions.yaml | 11 +++++ .../crds/core.oam.dev_appdeployments.yaml | 2 + .../core.oam.dev_applicationrevisions.yaml | 5 +++ .../crds/core.oam.dev_applications.yaml | 2 + .../crds/core.oam.dev_approllouts.yaml | 22 +++++++++ .../core.oam.dev_componentdefinitions.yaml | 12 +++++ .../crds/core.oam.dev_traitdefinitions.yaml | 12 ++++- .../core.oam.dev_workloaddefinitions.yaml | 6 +-- .../apply_trait_test.go | 2 +- 26 files changed, 269 insertions(+), 34 deletions(-) diff --git a/apis/core.oam.dev/v1alpha2/application_types.go b/apis/core.oam.dev/v1alpha2/application_types.go index c8fdb1d55..a7de13b4b 100644 --- a/apis/core.oam.dev/v1alpha2/application_types.go +++ b/apis/core.oam.dev/v1alpha2/application_types.go @@ -88,8 +88,14 @@ type ApplicationSpec struct { // Application is the Schema for the applications API // +kubebuilder:object:root=true -// +kubebuilder:resource:categories={oam} +// +kubebuilder:resource:categories={oam},shortName=apps // +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="COMPONENT",type=string,JSONPath=`.spec.components[*].name` +// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.components[*].type` +// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.status` +// +kubebuilder:printcolumn:name="HEALTHY",type=boolean,JSONPath=`.status.services[*].healthy` +// +kubebuilder:printcolumn:name="STATUS",type=string,JSONPath=`.status.services[*].message` +// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp" type Application struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/core.oam.dev/v1alpha2/applicationrevision_types.go b/apis/core.oam.dev/v1alpha2/applicationrevision_types.go index 57b168e5c..4fdf7cc4f 100644 --- a/apis/core.oam.dev/v1alpha2/applicationrevision_types.go +++ b/apis/core.oam.dev/v1alpha2/applicationrevision_types.go @@ -55,7 +55,8 @@ type ApplicationRevisionSpec struct { // ApplicationRevision is the Schema for the ApplicationRevision API // +kubebuilder:object:root=true -// +kubebuilder:shortName=apprev,resource:categories={oam} +// +kubebuilder:resource:categories={oam},shortName=apprev;revisions +// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp" type ApplicationRevision struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/core.oam.dev/v1alpha2/approllout_types.go b/apis/core.oam.dev/v1alpha2/approllout_types.go index bbb3159b7..750966a58 100644 --- a/apis/core.oam.dev/v1alpha2/approllout_types.go +++ b/apis/core.oam.dev/v1alpha2/approllout_types.go @@ -61,8 +61,14 @@ type AppRolloutStatus struct { // AppRollout is the Schema for the AppRollout API // +kubebuilder:object:root=true -// +kubebuilder:resource:categories={oam} +// +kubebuilder:resource:categories={oam},shortName=approllout;rollout // +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="TARGET",type=string,JSONPath=`.status.rolloutStatus.rolloutTargetSize` +// +kubebuilder:printcolumn:name="UPGRADED",type=string,JSONPath=`.status.rolloutStatus.upgradedReplicas` +// +kubebuilder:printcolumn:name="READY",type=string,JSONPath=`.status.rolloutStatus.upgradedReadyReplicas` +// +kubebuilder:printcolumn:name="BATCH-STATE",type=string,JSONPath=`.status.rolloutStatus.batchRollingState` +// +kubebuilder:printcolumn:name="ROLLING-STATE",type=string,JSONPath=`.status.rolloutStatus.rollingState` +// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp" type AppRollout struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/core.oam.dev/v1alpha2/componentdefinition_types.go b/apis/core.oam.dev/v1alpha2/componentdefinition_types.go index b82b07259..02f4ac93a 100644 --- a/apis/core.oam.dev/v1alpha2/componentdefinition_types.go +++ b/apis/core.oam.dev/v1alpha2/componentdefinition_types.go @@ -67,8 +67,11 @@ type ComponentDefinitionStatus struct { // +kubebuilder:object:root=true // ComponentDefinition is the Schema for the componentdefinitions API -// +kubebuilder:resource:scope=Namespaced,categories={oam} +// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=comp // +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="WORKLOAD-KIND",type=string,JSONPath=".spec.workload.definition.kind" +// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description" +// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp" type ComponentDefinition struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/core.oam.dev/v1alpha2/core_types.go b/apis/core.oam.dev/v1alpha2/core_types.go index 4a135ca42..45ccf57de 100644 --- a/apis/core.oam.dev/v1alpha2/core_types.go +++ b/apis/core.oam.dev/v1alpha2/core_types.go @@ -69,8 +69,9 @@ type WorkloadDefinitionStatus struct { // valid OAM workload kind by referencing its CustomResourceDefinition. The CRD // is used to validate the schema of the workload when it is embedded in an OAM // Component. -// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string -// +kubebuilder:resource:scope=Namespaced,categories={oam} +// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workload +// +kubebuilder:printcolumn:name="DEFINITION-NAME",type=string,JSONPath=".spec.definitionRef.name" +// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp" type WorkloadDefinition struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` @@ -158,9 +159,11 @@ type TraitDefinitionStatus struct { // OAM trait kind by referencing its CustomResourceDefinition. The CRD is used // to validate the schema of the trait when it is embedded in an OAM // ApplicationConfiguration. -// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string -// +kubebuilder:resource:scope=Namespaced,categories={oam} +// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=trait // +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="APPLIES-TO",type=string,JSONPath=".spec.appliesToWorkloads" +// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description" +// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp" type TraitDefinition struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/core.oam.dev/v1beta1/appdeployment_types.go b/apis/core.oam.dev/v1beta1/appdeployment_types.go index e8d0a0e22..97073550e 100644 --- a/apis/core.oam.dev/v1beta1/appdeployment_types.go +++ b/apis/core.oam.dev/v1beta1/appdeployment_types.go @@ -178,7 +178,7 @@ type AppDeploymentStatus struct { // AppDeployment is the Schema for the AppDeployment API // +kubebuilder:object:root=true -// +kubebuilder:resource:categories={oam} +// +kubebuilder:resource:categories={oam},shortName=appdeploy // +kubebuilder:subresource:status type AppDeployment struct { metav1.TypeMeta `json:",inline"` diff --git a/apis/core.oam.dev/v1beta1/application_types.go b/apis/core.oam.dev/v1beta1/application_types.go index 95d2b2e01..9ed1a19e6 100644 --- a/apis/core.oam.dev/v1beta1/application_types.go +++ b/apis/core.oam.dev/v1beta1/application_types.go @@ -67,6 +67,13 @@ type ApplicationSpec struct { // Application is the Schema for the applications API // +kubebuilder:storageversion // +kubebuilder:subresource:status +// +kubebuilder:resource:categories={oam},shortName=apps +// +kubebuilder:printcolumn:name="COMPONENT",type=string,JSONPath=`.spec.components[*].name` +// +kubebuilder:printcolumn:name="TYPE",type=string,JSONPath=`.spec.components[*].type` +// +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.status` +// +kubebuilder:printcolumn:name="HEALTHY",type=boolean,JSONPath=`.status.services[*].healthy` +// +kubebuilder:printcolumn:name="STATUS",type=string,JSONPath=`.status.services[*].message` +// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp" type Application struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/core.oam.dev/v1beta1/applicationrevision_types.go b/apis/core.oam.dev/v1beta1/applicationrevision_types.go index 85c3bb848..52bf74b39 100644 --- a/apis/core.oam.dev/v1beta1/applicationrevision_types.go +++ b/apis/core.oam.dev/v1beta1/applicationrevision_types.go @@ -56,6 +56,8 @@ type ApplicationRevisionSpec struct { // ApplicationRevision is the Schema for the ApplicationRevision API // +kubebuilder:storageversion +// +kubebuilder:resource:categories={oam},shortName=apprev;revisions +// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp" type ApplicationRevision struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/core.oam.dev/v1beta1/approllout_types.go b/apis/core.oam.dev/v1beta1/approllout_types.go index cc77a199e..3e529edbd 100644 --- a/apis/core.oam.dev/v1beta1/approllout_types.go +++ b/apis/core.oam.dev/v1beta1/approllout_types.go @@ -63,9 +63,15 @@ type AppRolloutStatus struct { // AppRollout is the Schema for the AppRollout API // +kubebuilder:object:root=true -// +kubebuilder:resource:categories={oam} +// +kubebuilder:resource:categories={oam},shortName=approllout;rollout // +kubebuilder:subresource:status // +kubebuilder:storageversion +// +kubebuilder:printcolumn:name="TARGET",type=string,JSONPath=`.status.rolloutTargetSize` +// +kubebuilder:printcolumn:name="UPGRADED",type=string,JSONPath=`.status.upgradedReplicas` +// +kubebuilder:printcolumn:name="READY",type=string,JSONPath=`.status.upgradedReadyReplicas` +// +kubebuilder:printcolumn:name="BATCH-STATE",type=string,JSONPath=`.status.batchRollingState` +// +kubebuilder:printcolumn:name="ROLLING-STATE",type=string,JSONPath=`.status.rollingState` +// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp" type AppRollout struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/core.oam.dev/v1beta1/componentdefinition_types.go b/apis/core.oam.dev/v1beta1/componentdefinition_types.go index 57a8bd69a..998253656 100644 --- a/apis/core.oam.dev/v1beta1/componentdefinition_types.go +++ b/apis/core.oam.dev/v1beta1/componentdefinition_types.go @@ -67,9 +67,12 @@ type ComponentDefinitionStatus struct { // +kubebuilder:object:root=true // ComponentDefinition is the Schema for the componentdefinitions API -// +kubebuilder:resource:scope=Namespaced,categories={oam} +// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=comp // +kubebuilder:storageversion // +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="WORKLOAD-KIND",type=string,JSONPath=".spec.workload.definition.kind" +// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description" +// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp" type ComponentDefinition struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/core.oam.dev/v1beta1/core_types.go b/apis/core.oam.dev/v1beta1/core_types.go index 478c2665a..b6140ad9b 100644 --- a/apis/core.oam.dev/v1beta1/core_types.go +++ b/apis/core.oam.dev/v1beta1/core_types.go @@ -67,9 +67,11 @@ type WorkloadDefinitionStatus struct { // valid OAM workload kind by referencing its CustomResourceDefinition. The CRD // is used to validate the schema of the workload when it is embedded in an OAM // Component. -// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string -// +kubebuilder:resource:scope=Namespaced,categories={oam} +// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=workload // +kubebuilder:storageversion +// +kubebuilder:printcolumn:name="DEFINITION-NAME",type=string,JSONPath=".spec.definitionRef.name" +// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description" +// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp" type WorkloadDefinition struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` @@ -157,10 +159,12 @@ type TraitDefinitionStatus struct { // OAM trait kind by referencing its CustomResourceDefinition. The CRD is used // to validate the schema of the trait when it is embedded in an OAM // ApplicationConfiguration. -// +kubebuilder:printcolumn:JSONPath=".spec.definitionRef.name",name=DEFINITION-NAME,type=string -// +kubebuilder:resource:scope=Namespaced,categories={oam} +// +kubebuilder:resource:scope=Namespaced,categories={oam},shortName=trait // +kubebuilder:subresource:status // +kubebuilder:storageversion +// +kubebuilder:printcolumn:name="APPLIES-TO",type=string,JSONPath=".spec.appliesToWorkloads" +// +kubebuilder:printcolumn:name="DESCRIPTION",type=string,JSONPath=".metadata.annotations.definition\\.oam\\.dev/description" +// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp" type TraitDefinition struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/charts/vela-core/crds/core.oam.dev_appdeployments.yaml b/charts/vela-core/crds/core.oam.dev_appdeployments.yaml index baee02efe..6a4d989b6 100644 --- a/charts/vela-core/crds/core.oam.dev_appdeployments.yaml +++ b/charts/vela-core/crds/core.oam.dev_appdeployments.yaml @@ -14,6 +14,8 @@ spec: kind: AppDeployment listKind: AppDeploymentList plural: appdeployments + shortNames: + - appdeploy singular: appdeployment scope: Namespaced versions: diff --git a/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml b/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml index e2a659a39..8547711c0 100644 --- a/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml +++ b/charts/vela-core/crds/core.oam.dev_applicationrevisions.yaml @@ -9,13 +9,22 @@ metadata: spec: group: core.oam.dev names: + categories: + - oam kind: ApplicationRevision listKind: ApplicationRevisionList plural: applicationrevisions + shortNames: + - apprev + - revisions singular: applicationrevision scope: Namespaced versions: - - name: v1alpha2 + - additionalPrinterColumns: + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1alpha2 schema: openAPIV3Schema: description: ApplicationRevision is the Schema for the ApplicationRevision API @@ -1058,7 +1067,12 @@ spec: type: object served: true storage: false - - name: v1beta1 + subresources: {} + - additionalPrinterColumns: + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 schema: openAPIV3Schema: description: ApplicationRevision is the Schema for the ApplicationRevision API @@ -2102,6 +2116,7 @@ spec: type: object served: true storage: true + subresources: {} status: acceptedNames: kind: "" diff --git a/charts/vela-core/crds/core.oam.dev_applications.yaml b/charts/vela-core/crds/core.oam.dev_applications.yaml index bfc6dff5b..08c68ad45 100644 --- a/charts/vela-core/crds/core.oam.dev_applications.yaml +++ b/charts/vela-core/crds/core.oam.dev_applications.yaml @@ -25,10 +25,31 @@ spec: kind: Application listKind: ApplicationList plural: applications + shortNames: + - apps singular: application scope: Namespaced versions: - - name: v1alpha2 + - additionalPrinterColumns: + - jsonPath: .spec.components[*].name + name: COMPONENT + type: string + - jsonPath: .spec.components[*].type + name: TYPE + type: string + - jsonPath: .status.status + name: PHASE + type: string + - jsonPath: .status.services[*].healthy + name: HEALTHY + type: boolean + - jsonPath: .status.services[*].message + name: STATUS + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1alpha2 schema: openAPIV3Schema: description: Application is the Schema for the applications API @@ -463,7 +484,26 @@ spec: storage: false subresources: status: {} - - name: v1beta1 + - additionalPrinterColumns: + - jsonPath: .spec.components[*].name + name: COMPONENT + type: string + - jsonPath: .spec.components[*].type + name: TYPE + type: string + - jsonPath: .status.status + name: PHASE + type: string + - jsonPath: .status.services[*].healthy + name: HEALTHY + type: boolean + - jsonPath: .status.services[*].message + name: STATUS + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 schema: openAPIV3Schema: description: Application is the Schema for the applications API diff --git a/charts/vela-core/crds/core.oam.dev_approllouts.yaml b/charts/vela-core/crds/core.oam.dev_approllouts.yaml index 59f15dbcb..bb998d761 100644 --- a/charts/vela-core/crds/core.oam.dev_approllouts.yaml +++ b/charts/vela-core/crds/core.oam.dev_approllouts.yaml @@ -14,10 +14,32 @@ spec: kind: AppRollout listKind: AppRolloutList plural: approllouts + shortNames: + - approllout + - rollout singular: approllout scope: Namespaced versions: - - name: v1alpha2 + - additionalPrinterColumns: + - jsonPath: .status.rolloutStatus.rolloutTargetSize + name: TARGET + type: string + - jsonPath: .status.rolloutStatus.upgradedReplicas + name: UPGRADED + type: string + - jsonPath: .status.rolloutStatus.upgradedReadyReplicas + name: READY + type: string + - jsonPath: .status.rolloutStatus.batchRollingState + name: BATCH-STATE + type: string + - jsonPath: .status.rolloutStatus.rollingState + name: ROLLING-STATE + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1alpha2 schema: openAPIV3Schema: description: AppRollout is the Schema for the AppRollout API @@ -346,7 +368,26 @@ spec: storage: false subresources: status: {} - - name: v1beta1 + - additionalPrinterColumns: + - jsonPath: .status.rolloutTargetSize + name: TARGET + type: string + - jsonPath: .status.upgradedReplicas + name: UPGRADED + type: string + - jsonPath: .status.upgradedReadyReplicas + name: READY + type: string + - jsonPath: .status.batchRollingState + name: BATCH-STATE + type: string + - jsonPath: .status.rollingState + name: ROLLING-STATE + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 schema: openAPIV3Schema: description: AppRollout is the Schema for the AppRollout API diff --git a/charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml b/charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml index 66d79bfbb..568dab1ea 100644 --- a/charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml +++ b/charts/vela-core/crds/core.oam.dev_componentdefinitions.yaml @@ -14,10 +14,22 @@ spec: kind: ComponentDefinition listKind: ComponentDefinitionList plural: componentdefinitions + shortNames: + - comp singular: componentdefinition scope: Namespaced versions: - - name: v1alpha2 + - additionalPrinterColumns: + - jsonPath: .spec.workload.definition.kind + name: WORKLOAD-KIND + type: string + - jsonPath: .metadata.annotations.definition\.oam\.dev/description + name: DESCRIPTION + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1alpha2 schema: openAPIV3Schema: description: ComponentDefinition is the Schema for the componentdefinitions API @@ -206,7 +218,17 @@ spec: storage: false subresources: status: {} - - name: v1beta1 + - additionalPrinterColumns: + - jsonPath: .spec.workload.definition.kind + name: WORKLOAD-KIND + type: string + - jsonPath: .metadata.annotations.definition\.oam\.dev/description + name: DESCRIPTION + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date + name: v1beta1 schema: openAPIV3Schema: description: ComponentDefinition is the Schema for the componentdefinitions API diff --git a/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml b/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml index fd1ecba97..b70f1f6f8 100644 --- a/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml +++ b/charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml @@ -14,13 +14,21 @@ spec: kind: TraitDefinition listKind: TraitDefinitionList plural: traitdefinitions + shortNames: + - trait singular: traitdefinition scope: Namespaced versions: - additionalPrinterColumns: - - jsonPath: .spec.definitionRef.name - name: DEFINITION-NAME + - jsonPath: .spec.appliesToWorkloads + name: APPLIES-TO type: string + - jsonPath: .metadata.annotations.definition\.oam\.dev/description + name: DESCRIPTION + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date name: v1alpha2 schema: openAPIV3Schema: @@ -192,9 +200,15 @@ spec: subresources: status: {} - additionalPrinterColumns: - - jsonPath: .spec.definitionRef.name - name: DEFINITION-NAME + - jsonPath: .spec.appliesToWorkloads + name: APPLIES-TO type: string + - jsonPath: .metadata.annotations.definition\.oam\.dev/description + name: DESCRIPTION + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date name: v1beta1 schema: openAPIV3Schema: diff --git a/charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml b/charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml index 2a97614ac..296e1e595 100644 --- a/charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml +++ b/charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml @@ -14,6 +14,8 @@ spec: kind: WorkloadDefinition listKind: WorkloadDefinitionList plural: workloaddefinitions + shortNames: + - workload singular: workloaddefinition scope: Namespaced versions: @@ -21,6 +23,9 @@ spec: - jsonPath: .spec.definitionRef.name name: DEFINITION-NAME type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date name: v1alpha2 schema: openAPIV3Schema: @@ -204,6 +209,12 @@ spec: - jsonPath: .spec.definitionRef.name name: DEFINITION-NAME type: string + - jsonPath: .metadata.annotations.definition\.oam\.dev/description + name: DESCRIPTION + type: string + - jsonPath: .metadata.creationTimestamp + name: AGE + type: date name: v1beta1 schema: openAPIV3Schema: diff --git a/legacy/charts/vela-core-legacy/crds/core.oam.dev_appdeployments.yaml b/legacy/charts/vela-core-legacy/crds/core.oam.dev_appdeployments.yaml index 01b2372f7..fedb1ccab 100644 --- a/legacy/charts/vela-core-legacy/crds/core.oam.dev_appdeployments.yaml +++ b/legacy/charts/vela-core-legacy/crds/core.oam.dev_appdeployments.yaml @@ -14,6 +14,8 @@ spec: kind: AppDeployment listKind: AppDeploymentList plural: appdeployments + shortNames: + - appdeploy singular: appdeployment scope: Namespaced subresources: diff --git a/legacy/charts/vela-core-legacy/crds/core.oam.dev_applicationrevisions.yaml b/legacy/charts/vela-core-legacy/crds/core.oam.dev_applicationrevisions.yaml index eb5a23485..eb2b94df6 100644 --- a/legacy/charts/vela-core-legacy/crds/core.oam.dev_applicationrevisions.yaml +++ b/legacy/charts/vela-core-legacy/crds/core.oam.dev_applicationrevisions.yaml @@ -9,9 +9,14 @@ metadata: spec: group: core.oam.dev names: + categories: + - oam kind: ApplicationRevision listKind: ApplicationRevisionList plural: applicationrevisions + shortNames: + - apprev + - revisions singular: applicationrevision scope: Namespaced validation: diff --git a/legacy/charts/vela-core-legacy/crds/core.oam.dev_applications.yaml b/legacy/charts/vela-core-legacy/crds/core.oam.dev_applications.yaml index 8cfba7263..ec259e773 100644 --- a/legacy/charts/vela-core-legacy/crds/core.oam.dev_applications.yaml +++ b/legacy/charts/vela-core-legacy/crds/core.oam.dev_applications.yaml @@ -14,6 +14,8 @@ spec: kind: Application listKind: ApplicationList plural: applications + shortNames: + - apps singular: application scope: Namespaced validation: diff --git a/legacy/charts/vela-core-legacy/crds/core.oam.dev_approllouts.yaml b/legacy/charts/vela-core-legacy/crds/core.oam.dev_approllouts.yaml index e949156f7..2969b6cc7 100644 --- a/legacy/charts/vela-core-legacy/crds/core.oam.dev_approllouts.yaml +++ b/legacy/charts/vela-core-legacy/crds/core.oam.dev_approllouts.yaml @@ -7,6 +7,25 @@ metadata: controller-gen.kubebuilder.io/version: v0.2.4 name: approllouts.core.oam.dev spec: + additionalPrinterColumns: + - JSONPath: .status.rolloutTargetSize + name: TARGET + type: string + - JSONPath: .status.upgradedReplicas + name: UPGRADED + type: string + - JSONPath: .status.upgradedReadyReplicas + name: READY + type: string + - JSONPath: .status.batchRollingState + name: BATCH-STATE + type: string + - JSONPath: .status.rollingState + name: ROLLING-STATE + type: string + - JSONPath: .metadata.creationTimestamp + name: AGE + type: date group: core.oam.dev names: categories: @@ -14,6 +33,9 @@ spec: kind: AppRollout listKind: AppRolloutList plural: approllouts + shortNames: + - approllout + - rollout singular: approllout scope: Namespaced validation: diff --git a/legacy/charts/vela-core-legacy/crds/core.oam.dev_componentdefinitions.yaml b/legacy/charts/vela-core-legacy/crds/core.oam.dev_componentdefinitions.yaml index bc275b6e2..0a303cd57 100644 --- a/legacy/charts/vela-core-legacy/crds/core.oam.dev_componentdefinitions.yaml +++ b/legacy/charts/vela-core-legacy/crds/core.oam.dev_componentdefinitions.yaml @@ -7,6 +7,16 @@ metadata: controller-gen.kubebuilder.io/version: v0.2.4 name: componentdefinitions.core.oam.dev spec: + additionalPrinterColumns: + - JSONPath: .spec.workload.definition.kind + name: WORKLOAD-KIND + type: string + - JSONPath: .metadata.annotations.definition\.oam\.dev/description + name: DESCRIPTION + type: string + - JSONPath: .metadata.creationTimestamp + name: AGE + type: date group: core.oam.dev names: categories: @@ -14,6 +24,8 @@ spec: kind: ComponentDefinition listKind: ComponentDefinitionList plural: componentdefinitions + shortNames: + - comp singular: componentdefinition scope: Namespaced subresources: diff --git a/legacy/charts/vela-core-legacy/crds/core.oam.dev_traitdefinitions.yaml b/legacy/charts/vela-core-legacy/crds/core.oam.dev_traitdefinitions.yaml index 4d488e42e..afdc305ed 100644 --- a/legacy/charts/vela-core-legacy/crds/core.oam.dev_traitdefinitions.yaml +++ b/legacy/charts/vela-core-legacy/crds/core.oam.dev_traitdefinitions.yaml @@ -8,9 +8,15 @@ metadata: name: traitdefinitions.core.oam.dev spec: additionalPrinterColumns: - - JSONPath: .spec.definitionRef.name - name: DEFINITION-NAME + - JSONPath: .spec.appliesToWorkloads + name: APPLIES-TO type: string + - JSONPath: .metadata.annotations.definition\.oam\.dev/description + name: DESCRIPTION + type: string + - JSONPath: .metadata.creationTimestamp + name: AGE + type: date group: core.oam.dev names: categories: @@ -18,6 +24,8 @@ spec: kind: TraitDefinition listKind: TraitDefinitionList plural: traitdefinitions + shortNames: + - trait singular: traitdefinition scope: Namespaced subresources: diff --git a/legacy/charts/vela-core-legacy/crds/core.oam.dev_workloaddefinitions.yaml b/legacy/charts/vela-core-legacy/crds/core.oam.dev_workloaddefinitions.yaml index 217fd3cc7..85d144281 100644 --- a/legacy/charts/vela-core-legacy/crds/core.oam.dev_workloaddefinitions.yaml +++ b/legacy/charts/vela-core-legacy/crds/core.oam.dev_workloaddefinitions.yaml @@ -7,10 +7,6 @@ metadata: controller-gen.kubebuilder.io/version: v0.2.4 name: workloaddefinitions.core.oam.dev spec: - additionalPrinterColumns: - - JSONPath: .spec.definitionRef.name - name: DEFINITION-NAME - type: string group: core.oam.dev names: categories: @@ -18,6 +14,8 @@ spec: kind: WorkloadDefinition listKind: WorkloadDefinitionList plural: workloaddefinitions + shortNames: + - workload singular: workloaddefinition scope: Namespaced subresources: {} diff --git a/pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/apply_trait_test.go b/pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/apply_trait_test.go index 8e7d9d785..e33d43a17 100644 --- a/pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/apply_trait_test.go +++ b/pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/apply_trait_test.go @@ -273,7 +273,7 @@ spec: return 0 } return traitObj.GetGeneration() - }, 5*time.Second, time.Second).Should(Equal(int64(2))) + }, 20*time.Second, time.Second).Should(Equal(int64(2))) By("Check labels are removed") _, found, _ := unstructured.NestedString(traitObj.UnstructuredContent(), "metadata", "labels", "test.label")