Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UCP: additionalPrinterColumns tidbautoscaler #1943

Merged
merged 10 commits into from
Mar 25, 2020
Merged

UCP: additionalPrinterColumns tidbautoscaler #1943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d22654a
move tidb-autoscaler example to other commit
shonge Mar 18, 2020
d8a09ba
Merge branch 'master' into dev_ta_info
Yisaer Mar 19, 2020
69fc5a4
replace tidb cluster to tidb
shonge Mar 19, 2020
ff31b59
Update pkg/util/crdutil.go
shonge Mar 19, 2020
7b828c5
Update pkg/util/crdutil.go
shonge Mar 19, 2020
fdedadf
Update pkg/util/crdutil.go
shonge Mar 19, 2020
9bfb444
Merge branch 'master' into dev_ta_info
Yisaer Mar 23, 2020
ff7e98d
update autoscaler crd
shonge Mar 24, 2020
5f37524
Merge branch 'master' into dev_ta_info
shonge Mar 24, 2020
f7961a3
Merge branch 'master' into dev_ta_info
sre-bot Mar 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions manifests/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 31 additions & 0 deletions pkg/util/crdutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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 {
Expand Down Expand Up @@ -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
}
Expand Down