From d22654ac2816227472e7a4776ae73072476bcfec Mon Sep 17 00:00:00 2001 From: shonge Date: Wed, 18 Mar 2020 19:34:47 +0800 Subject: [PATCH 1/6] move tidb-autoscaler example to other commit --- manifests/crd.yaml | 17 +++++++++++++++++ pkg/util/crdutil.go | 31 +++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/manifests/crd.yaml b/manifests/crd.yaml index bdcc5d2fdd..423bde2c9e 100644 --- a/manifests/crd.yaml +++ b/manifests/crd.yaml @@ -8932,6 +8932,23 @@ metadata: creationTimestamp: null name: tidbclusterautoscalers.pingcap.com spec: + additionalPrinterColumns: + - JSONPath: .spec.tidb.maxReplicas + description: The max replicas number of TiDB cluster + name: TiDB-MaxReplicas + type: integer + - JSONPath: .spec.tidb.minReplicas + description: The Min replicas number of TiDB cluster + name: TiDB-MinReplicas + type: integer + - JSONPath: .spec.tikv.maxReplicas + description: The max replicas number of TiKV cluster + name: TiKV-MaxReplicas + type: integer + - JSONPath: .spec.tikv.minReplicas + description: The Min replicas number of TiKV cluster + 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..97fd8b154a 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 max replicas number of TiKV cluster", + JSONPath: ".spec.tikv.maxReplicas", + } + autoScalerTiKVMinReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ + Name: "TiKV-MinReplicas", + Type: "integer", + Description: "The Min replicas number of TiKV cluster", + JSONPath: ".spec.tikv.minReplicas", + } + // TODO add The current replicas number of TiDB cluster + autoScalerTiDBMaxReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ + Name: "TiDB-MaxReplicas", + Type: "integer", + Description: "The max replicas number of TiDB cluster", + JSONPath: ".spec.tidb.maxReplicas", + } + autoScalerTiDBMinReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ + Name: "TiDB-MinReplicas", + Type: "integer", + Description: "The Min replicas number of TiDB cluster", + 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 } From 69fc5a403a667cdda4ab6636884fbaa4e39074ec Mon Sep 17 00:00:00 2001 From: Song Date: Thu, 19 Mar 2020 20:29:32 +0800 Subject: [PATCH 2/6] replace tidb cluster to tidb Co-Authored-By: Yecheng Fu --- pkg/util/crdutil.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/util/crdutil.go b/pkg/util/crdutil.go index 97fd8b154a..2383e3a4d0 100644 --- a/pkg/util/crdutil.go +++ b/pkg/util/crdutil.go @@ -195,7 +195,7 @@ var ( autoScalerTiDBMinReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ Name: "TiDB-MinReplicas", Type: "integer", - Description: "The Min replicas number of TiDB cluster", + Description: "The minimal replicas of TiDB", JSONPath: ".spec.tidb.minReplicas", } ) From ff31b59d4e0404e0c5e12329fdae3dec7caa5ab2 Mon Sep 17 00:00:00 2001 From: Song Date: Thu, 19 Mar 2020 20:29:45 +0800 Subject: [PATCH 3/6] Update pkg/util/crdutil.go Co-Authored-By: Yecheng Fu --- pkg/util/crdutil.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/util/crdutil.go b/pkg/util/crdutil.go index 2383e3a4d0..c6e6157cc5 100644 --- a/pkg/util/crdutil.go +++ b/pkg/util/crdutil.go @@ -189,7 +189,7 @@ var ( autoScalerTiDBMaxReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ Name: "TiDB-MaxReplicas", Type: "integer", - Description: "The max replicas number of TiDB cluster", + Description: "The maximal replicas of TiDB", JSONPath: ".spec.tidb.maxReplicas", } autoScalerTiDBMinReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ From 7b828c56aeef8397179b3177d7e9ac3ddc449147 Mon Sep 17 00:00:00 2001 From: Song Date: Thu, 19 Mar 2020 20:29:58 +0800 Subject: [PATCH 4/6] Update pkg/util/crdutil.go Co-Authored-By: Yecheng Fu --- pkg/util/crdutil.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/util/crdutil.go b/pkg/util/crdutil.go index c6e6157cc5..9b96debdb2 100644 --- a/pkg/util/crdutil.go +++ b/pkg/util/crdutil.go @@ -182,7 +182,7 @@ var ( autoScalerTiKVMinReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ Name: "TiKV-MinReplicas", Type: "integer", - Description: "The Min replicas number of TiKV cluster", + Description: "The minimal replicas of TiKV", JSONPath: ".spec.tikv.minReplicas", } // TODO add The current replicas number of TiDB cluster From fdedadf3097b8d05099bc37de8b0c0498b85ab04 Mon Sep 17 00:00:00 2001 From: Song Date: Thu, 19 Mar 2020 20:30:08 +0800 Subject: [PATCH 5/6] Update pkg/util/crdutil.go Co-Authored-By: Yecheng Fu --- pkg/util/crdutil.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/util/crdutil.go b/pkg/util/crdutil.go index 9b96debdb2..a0abe8d90c 100644 --- a/pkg/util/crdutil.go +++ b/pkg/util/crdutil.go @@ -176,7 +176,7 @@ var ( autoScalerTiKVMaxReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ Name: "TiKV-MaxReplicas", Type: "integer", - Description: "The max replicas number of TiKV cluster", + Description: "The maximal replicas of TiKV", JSONPath: ".spec.tikv.maxReplicas", } autoScalerTiKVMinReplicasColumn = extensionsobj.CustomResourceColumnDefinition{ From ff7e98dd6284ea0954a5d235d5a90982e3229961 Mon Sep 17 00:00:00 2001 From: shonge Date: Tue, 24 Mar 2020 20:20:20 +0800 Subject: [PATCH 6/6] update autoscaler crd --- manifests/crd.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/crd.yaml b/manifests/crd.yaml index 208b7dd3d1..30d2f4b039 100644 --- a/manifests/crd.yaml +++ b/manifests/crd.yaml @@ -8931,19 +8931,19 @@ metadata: spec: additionalPrinterColumns: - JSONPath: .spec.tidb.maxReplicas - description: The max replicas number of TiDB cluster + description: The maximal replicas of TiDB name: TiDB-MaxReplicas type: integer - JSONPath: .spec.tidb.minReplicas - description: The Min replicas number of TiDB cluster + description: The minimal replicas of TiDB name: TiDB-MinReplicas type: integer - JSONPath: .spec.tikv.maxReplicas - description: The max replicas number of TiKV cluster + description: The maximal replicas of TiKV name: TiKV-MaxReplicas type: integer - JSONPath: .spec.tikv.minReplicas - description: The Min replicas number of TiKV cluster + description: The minimal replicas of TiKV name: TiKV-MinReplicas type: integer group: pingcap.com