diff --git a/manifests/crd.yaml b/manifests/crd.yaml index 6d0944c621..a0d18390dc 100644 --- a/manifests/crd.yaml +++ b/manifests/crd.yaml @@ -9037,6 +9037,23 @@ metadata: creationTimestamp: null name: tidbclusterautoscalers.pingcap.com spec: + additionalPrinterColumns: + - JSONPath: .spec.tidb.maxReplicas + description: The maximal replicas of TiDB + name: TiDB-MaxReplicas + type: integer + - JSONPath: .spec.tidb.minReplicas + description: The minimal replicas of TiDB + name: TiDB-MinReplicas + type: integer + - JSONPath: .spec.tikv.maxReplicas + description: The maximal replicas of TiKV + name: TiKV-MaxReplicas + type: integer + - JSONPath: .spec.tikv.minReplicas + description: The minimal replicas of TiKV + name: TiKV-MinReplicas + type: integer group: pingcap.com names: kind: TidbClusterAutoScaler diff --git a/pkg/util/crdutil.go b/pkg/util/crdutil.go index 0b5d884a30..a0abe8d90c 100644 --- a/pkg/util/crdutil.go +++ b/pkg/util/crdutil.go @@ -171,6 +171,33 @@ var ( Priority: 1, JSONPath: ".status.phase", } + autoScalerPrinterColumns []extensionsobj.CustomResourceColumnDefinition + // TODO add The current replicas number of TiKV cluster + autoScalerTiKVMaxReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ + Name: "TiKV-MaxReplicas", + Type: "integer", + Description: "The maximal replicas of TiKV", + JSONPath: ".spec.tikv.maxReplicas", + } + autoScalerTiKVMinReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ + Name: "TiKV-MinReplicas", + Type: "integer", + Description: "The minimal replicas of TiKV", + JSONPath: ".spec.tikv.minReplicas", + } + // TODO add The current replicas number of TiDB cluster + autoScalerTiDBMaxReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ + Name: "TiDB-MaxReplicas", + Type: "integer", + Description: "The maximal replicas of TiDB", + JSONPath: ".spec.tidb.maxReplicas", + } + autoScalerTiDBMinReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ + Name: "TiDB-MinReplicas", + Type: "integer", + Description: "The minimal replicas of TiDB", + JSONPath: ".spec.tidb.minReplicas", + } ) func init() { @@ -182,6 +209,8 @@ func init() { restoreAdditionalPrinterColumns = append(restoreAdditionalPrinterColumns, restoreStartedColumn, restoreCompletedColumn) bksAdditionalPrinterColumns = append(bksAdditionalPrinterColumns, bksScheduleColumn, bksMaxBackups, bksLastBackup, bksLastBackupTime) tidbInitializerPrinterColumns = append(tidbInitializerPrinterColumns, tidbInitializerPhase) + autoScalerPrinterColumns = append(autoScalerPrinterColumns, autoScalerTiDBMaxReplicasColumn, autoScalerTiDBMinReplicasColumn, + autoScalerTiKVMaxReplicasColumn, autoScalerTiKVMinReplicasColumn) } func NewCustomResourceDefinition(crdKind v1alpha1.CrdKind, group string, labels map[string]string, validation bool) *extensionsobj.CustomResourceDefinition { @@ -242,6 +271,8 @@ func addAdditionalPrinterColumnsForCRD(crd *extensionsobj.CustomResourceDefiniti case v1alpha1.DefaultCrdKinds.TiDBInitializer.Kind: crd.Spec.AdditionalPrinterColumns = tidbInitializerPrinterColumns break + case v1alpha1.DefaultCrdKinds.TidbClusterAutoScaler.Kind: + crd.Spec.AdditionalPrinterColumns = autoScalerPrinterColumns default: break }