diff --git a/apis/apps/v1alpha1/component_types.go b/apis/apps/v1alpha1/component_types.go index 3c01d6bc0b4..b4975523eca 100644 --- a/apis/apps/v1alpha1/component_types.go +++ b/apis/apps/v1alpha1/component_types.go @@ -334,7 +334,7 @@ type ComponentStatus struct { // +genclient // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:resource:categories={kubeblocks,all},shortName=cmp +// +kubebuilder:resource:categories={kubeblocks},shortName=cmp // +kubebuilder:printcolumn:name="DEFINITION",type="string",JSONPath=".spec.compDef",description="component definition" // +kubebuilder:printcolumn:name="SERVICE-VERSION",type="string",JSONPath=".spec.serviceVersion",description="service version" // +kubebuilder:printcolumn:name="STATUS",type="string",JSONPath=".status.phase",description="status phase" diff --git a/apis/apps/v1alpha1/componentresourceconstraint_types.go b/apis/apps/v1alpha1/componentresourceconstraint_types.go index 1cd1e997f43..7937667152d 100644 --- a/apis/apps/v1alpha1/componentresourceconstraint_types.go +++ b/apis/apps/v1alpha1/componentresourceconstraint_types.go @@ -158,7 +158,7 @@ type StorageConstraint struct { // +genclient:nonNamespaced // +k8s:openapi-gen=true // +kubebuilder:object:root=true -// +kubebuilder:resource:categories={kubeblocks,all},scope=Cluster,shortName=crc +// +kubebuilder:resource:categories={kubeblocks},scope=Cluster,shortName=crc // +kubebuilder:deprecatedversion:warning="Due to the lack of practical use cases, this API is deprecated from KB 0.9.0." // ComponentResourceConstraint is the Schema for the componentresourceconstraints API diff --git a/apis/apps/v1alpha1/opsdefinition_types.go b/apis/apps/v1alpha1/opsdefinition_types.go index 1f0ee74bda3..a65d9a1d71d 100644 --- a/apis/apps/v1alpha1/opsdefinition_types.go +++ b/apis/apps/v1alpha1/opsdefinition_types.go @@ -464,7 +464,7 @@ type OpsDefinitionStatus struct { // +k8s:openapi-gen=true // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:resource:categories={kubeblocks,all},scope=Cluster,shortName=od +// +kubebuilder:resource:categories={kubeblocks},scope=Cluster,shortName=od // +kubebuilder:printcolumn:name="STATUS",type="string",JSONPath=".status.phase",description="OpsDefinition status phase." // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" diff --git a/apis/apps/v1alpha1/opsrequest_types.go b/apis/apps/v1alpha1/opsrequest_types.go index 24e25751e58..ee95f47e547 100644 --- a/apis/apps/v1alpha1/opsrequest_types.go +++ b/apis/apps/v1alpha1/opsrequest_types.go @@ -1387,7 +1387,7 @@ type UpdatedParameters struct { // +k8s:openapi-gen=true // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:resource:categories={kubeblocks,all},shortName=ops +// +kubebuilder:resource:categories={kubeblocks},shortName=ops // +kubebuilder:printcolumn:name="TYPE",type="string",JSONPath=".spec.type",description="Operation request type." // +kubebuilder:printcolumn:name="CLUSTER",type="string",JSONPath=".spec.clusterName",description="Operand cluster." // +kubebuilder:printcolumn:name="STATUS",type="string",JSONPath=".status.phase",description="Operation status phase." diff --git a/apis/apps/v1alpha1/servicedescriptor_types.go b/apis/apps/v1alpha1/servicedescriptor_types.go index b3acbbd32ad..19e56c7de8d 100644 --- a/apis/apps/v1alpha1/servicedescriptor_types.go +++ b/apis/apps/v1alpha1/servicedescriptor_types.go @@ -137,7 +137,7 @@ func (r ServiceDescriptorStatus) GetTerminalPhases() []Phase { // +k8s:openapi-gen=true // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:resource:categories={kubeblocks,all},shortName=sd +// +kubebuilder:resource:categories={kubeblocks},shortName=sd // +kubebuilder:printcolumn:name="SERVICE_KIND",type="string",JSONPath=".spec.serviceKind",description="service kind" // +kubebuilder:printcolumn:name="SERVICE_VERSION",type="string",JSONPath=".spec.serviceVersion",description="service version" // +kubebuilder:printcolumn:name="STATUS",type="string",JSONPath=".status.phase",description="status phase" diff --git a/apis/dataprotection/v1alpha1/restore_types.go b/apis/dataprotection/v1alpha1/restore_types.go index 90a1773f27f..7794ccca108 100644 --- a/apis/dataprotection/v1alpha1/restore_types.go +++ b/apis/dataprotection/v1alpha1/restore_types.go @@ -484,7 +484,7 @@ type RestoreStatus struct { // +k8s:openapi-gen=true // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:resource:categories={kubeblocks,all} +// +kubebuilder:resource:categories={kubeblocks} // +kubebuilder:printcolumn:name="BACKUP",type="string",JSONPath=".spec.backup.name" // +kubebuilder:printcolumn:name="RESTORE-TIME",type="string",JSONPath=".spec.restoreTime",description="Point in time for restoring" // +kubebuilder:printcolumn:name="STATUS",type="string",JSONPath=".status.phase",description="Restore Status." diff --git a/apis/experimental/v1alpha1/nodecountscaler_types.go b/apis/experimental/v1alpha1/nodecountscaler_types.go index e317752551d..5a762097c15 100644 --- a/apis/experimental/v1alpha1/nodecountscaler_types.go +++ b/apis/experimental/v1alpha1/nodecountscaler_types.go @@ -98,7 +98,7 @@ const ( // +genclient // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:resource:categories={kubeblocks,all},shortName=ncs +// +kubebuilder:resource:categories={kubeblocks},shortName=ncs // +kubebuilder:printcolumn:name="TARGET-CLUSTER-NAME",type="string",JSONPath=".spec.targetClusterName",description="target cluster name." // +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type==\"ScaleReady\")].status",description="scale ready." // +kubebuilder:printcolumn:name="REASON",type="string",JSONPath=".status.conditions[?(@.type==\"ScaleReady\")].reason",description="reason." diff --git a/apis/workloads/legacy/replicatedstatemachine_types.go b/apis/workloads/legacy/replicatedstatemachine_types.go index d9bc784d876..ee7f05bf292 100644 --- a/apis/workloads/legacy/replicatedstatemachine_types.go +++ b/apis/workloads/legacy/replicatedstatemachine_types.go @@ -264,7 +264,7 @@ type ReplicatedStateMachineStatus struct { // +genclient // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:resource:categories={kubeblocks,all},shortName=its +// +kubebuilder:resource:categories={kubeblocks},shortName=its // +kubebuilder:printcolumn:name="LEADER",type="string",JSONPath=".status.membersStatus[?(@.role.isLeader==true)].podName",description="leader pod name." // +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.readyReplicas",description="ready replicas." // +kubebuilder:printcolumn:name="REPLICAS",type="string",JSONPath=".status.replicas",description="total replicas." diff --git a/apis/workloads/v1alpha1/instanceset_types.go b/apis/workloads/v1alpha1/instanceset_types.go index f2427981591..1257b998c57 100644 --- a/apis/workloads/v1alpha1/instanceset_types.go +++ b/apis/workloads/v1alpha1/instanceset_types.go @@ -485,7 +485,7 @@ type InstanceSetStatus struct { // +genclient // +kubebuilder:object:root=true // +kubebuilder:subresource:status -// +kubebuilder:resource:categories={kubeblocks,all},shortName=its +// +kubebuilder:resource:categories={kubeblocks},shortName=its // +kubebuilder:printcolumn:name="LEADER",type="string",JSONPath=".status.membersStatus[?(@.role.isLeader==true)].podName",description="leader instance name." // +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.readyReplicas",description="ready replicas." // +kubebuilder:printcolumn:name="REPLICAS",type="string",JSONPath=".status.replicas",description="total replicas." diff --git a/config/crd/bases/apps.kubeblocks.io_componentresourceconstraints.yaml b/config/crd/bases/apps.kubeblocks.io_componentresourceconstraints.yaml index 2b14f4aa7d7..4558f2dfb5b 100644 --- a/config/crd/bases/apps.kubeblocks.io_componentresourceconstraints.yaml +++ b/config/crd/bases/apps.kubeblocks.io_componentresourceconstraints.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: ComponentResourceConstraint listKind: ComponentResourceConstraintList plural: componentresourceconstraints diff --git a/config/crd/bases/apps.kubeblocks.io_components.yaml b/config/crd/bases/apps.kubeblocks.io_components.yaml index 63f5794d768..ac4e13fba36 100644 --- a/config/crd/bases/apps.kubeblocks.io_components.yaml +++ b/config/crd/bases/apps.kubeblocks.io_components.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: Component listKind: ComponentList plural: components diff --git a/config/crd/bases/apps.kubeblocks.io_opsdefinitions.yaml b/config/crd/bases/apps.kubeblocks.io_opsdefinitions.yaml index 1d4b9468209..639aa6ba246 100644 --- a/config/crd/bases/apps.kubeblocks.io_opsdefinitions.yaml +++ b/config/crd/bases/apps.kubeblocks.io_opsdefinitions.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: OpsDefinition listKind: OpsDefinitionList plural: opsdefinitions diff --git a/config/crd/bases/apps.kubeblocks.io_opsrequests.yaml b/config/crd/bases/apps.kubeblocks.io_opsrequests.yaml index 53fd6a1c29a..972aaa59cce 100644 --- a/config/crd/bases/apps.kubeblocks.io_opsrequests.yaml +++ b/config/crd/bases/apps.kubeblocks.io_opsrequests.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: OpsRequest listKind: OpsRequestList plural: opsrequests diff --git a/config/crd/bases/apps.kubeblocks.io_servicedescriptors.yaml b/config/crd/bases/apps.kubeblocks.io_servicedescriptors.yaml index 7be8abce397..5568facac16 100644 --- a/config/crd/bases/apps.kubeblocks.io_servicedescriptors.yaml +++ b/config/crd/bases/apps.kubeblocks.io_servicedescriptors.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: ServiceDescriptor listKind: ServiceDescriptorList plural: servicedescriptors diff --git a/config/crd/bases/dataprotection.kubeblocks.io_restores.yaml b/config/crd/bases/dataprotection.kubeblocks.io_restores.yaml index bcd3ca3b0af..6fcf04fa32a 100644 --- a/config/crd/bases/dataprotection.kubeblocks.io_restores.yaml +++ b/config/crd/bases/dataprotection.kubeblocks.io_restores.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: Restore listKind: RestoreList plural: restores diff --git a/config/crd/bases/experimental.kubeblocks.io_nodecountscalers.yaml b/config/crd/bases/experimental.kubeblocks.io_nodecountscalers.yaml index 738a3140689..1a957b0f3eb 100644 --- a/config/crd/bases/experimental.kubeblocks.io_nodecountscalers.yaml +++ b/config/crd/bases/experimental.kubeblocks.io_nodecountscalers.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: NodeCountScaler listKind: NodeCountScalerList plural: nodecountscalers diff --git a/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml b/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml index f081708f86e..dfc0cf2d7d0 100644 --- a/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml +++ b/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: InstanceSet listKind: InstanceSetList plural: instancesets diff --git a/deploy/helm/crds/apps.kubeblocks.io_componentresourceconstraints.yaml b/deploy/helm/crds/apps.kubeblocks.io_componentresourceconstraints.yaml index 2b14f4aa7d7..4558f2dfb5b 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_componentresourceconstraints.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_componentresourceconstraints.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: ComponentResourceConstraint listKind: ComponentResourceConstraintList plural: componentresourceconstraints diff --git a/deploy/helm/crds/apps.kubeblocks.io_components.yaml b/deploy/helm/crds/apps.kubeblocks.io_components.yaml index 63f5794d768..ac4e13fba36 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_components.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_components.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: Component listKind: ComponentList plural: components diff --git a/deploy/helm/crds/apps.kubeblocks.io_opsdefinitions.yaml b/deploy/helm/crds/apps.kubeblocks.io_opsdefinitions.yaml index 1d4b9468209..639aa6ba246 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_opsdefinitions.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_opsdefinitions.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: OpsDefinition listKind: OpsDefinitionList plural: opsdefinitions diff --git a/deploy/helm/crds/apps.kubeblocks.io_opsrequests.yaml b/deploy/helm/crds/apps.kubeblocks.io_opsrequests.yaml index 53fd6a1c29a..972aaa59cce 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_opsrequests.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_opsrequests.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: OpsRequest listKind: OpsRequestList plural: opsrequests diff --git a/deploy/helm/crds/apps.kubeblocks.io_servicedescriptors.yaml b/deploy/helm/crds/apps.kubeblocks.io_servicedescriptors.yaml index 7be8abce397..5568facac16 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_servicedescriptors.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_servicedescriptors.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: ServiceDescriptor listKind: ServiceDescriptorList plural: servicedescriptors diff --git a/deploy/helm/crds/dataprotection.kubeblocks.io_restores.yaml b/deploy/helm/crds/dataprotection.kubeblocks.io_restores.yaml index bcd3ca3b0af..6fcf04fa32a 100644 --- a/deploy/helm/crds/dataprotection.kubeblocks.io_restores.yaml +++ b/deploy/helm/crds/dataprotection.kubeblocks.io_restores.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: Restore listKind: RestoreList plural: restores diff --git a/deploy/helm/crds/experimental.kubeblocks.io_nodecountscalers.yaml b/deploy/helm/crds/experimental.kubeblocks.io_nodecountscalers.yaml index 738a3140689..1a957b0f3eb 100644 --- a/deploy/helm/crds/experimental.kubeblocks.io_nodecountscalers.yaml +++ b/deploy/helm/crds/experimental.kubeblocks.io_nodecountscalers.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: NodeCountScaler listKind: NodeCountScalerList plural: nodecountscalers diff --git a/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml b/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml index f081708f86e..dfc0cf2d7d0 100644 --- a/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml +++ b/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml @@ -11,7 +11,6 @@ spec: names: categories: - kubeblocks - - all kind: InstanceSet listKind: InstanceSetList plural: instancesets