chore: remove some KB CRDs from the resource category all (#8036)

apecloud · Aug 28, 2024 · 3698818 · 3698818
1 parent 00cf62d
commit 3698818
Show file tree

Hide file tree

Showing 25 changed files with 9 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,7 +11,6 @@ spec:
   names:
     categories:
     - kubeblocks
-    - all
     kind: InstanceSet
     listKind: InstanceSetList
     plural: instancesets