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

fix autoscaler api #1718

Merged
merged 2 commits into from
Feb 18, 2020
Merged

fix autoscaler api #1718

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94a2db2
fix autoscaler api
Feb 18, 2020
6be76ec
Merge branch 'master' into fix_auto_scaler_type
sre-bot Feb 18, 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
16 changes: 8 additions & 8 deletions manifests/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7060,10 +7060,6 @@ spec:
tidb:
description: TidbAutoScalerSpec describes the spec for tidb auto-scaling
properties:
MetricsTimeDuration:
description: MetricsTimeDuration describe the Time duration to be
queried in the Prometheus
type: string
maxReplicas:
description: maxReplicas is the upper limit for the number of replicas
to which the autoscaler can scale out. It cannot be less than
Expand All @@ -7082,6 +7078,10 @@ spec:
metric will be set to 80% average CPU utilization.
items: {}
type: array
metricsTimeDuration:
description: MetricsTimeDuration describe the Time duration to be
queried in the Prometheus
type: string
minReplicas:
description: minReplicas is the lower limit for the number of replicas
to which the autoscaler can scale down. It defaults to 1 pod.
Expand Down Expand Up @@ -7120,10 +7120,6 @@ spec:
tikv:
description: TikvAutoScalerSpec describes the spec for tikv auto-scaling
properties:
MetricsTimeDuration:
description: MetricsTimeDuration describe the Time duration to be
queried in the Prometheus
type: string
maxReplicas:
description: maxReplicas is the upper limit for the number of replicas
to which the autoscaler can scale out. It cannot be less than
Expand All @@ -7142,6 +7138,10 @@ spec:
metric will be set to 80% average CPU utilization.
items: {}
type: array
metricsTimeDuration:
description: MetricsTimeDuration describe the Time duration to be
queried in the Prometheus
type: string
minReplicas:
description: minReplicas is the lower limit for the number of replicas
to which the autoscaler can scale down. It defaults to 1 pod.
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/pingcap/v1alpha1/openapi_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/pingcap/v1alpha1/tidbclusterautoscaler_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ type BasicAutoScalerSpec struct {

// MetricsTimeDuration describe the Time duration to be queried in the Prometheus
// +optional
MetricsTimeDuration *string `json:"MetricsTimeDuration,omitempty"`
MetricsTimeDuration *string `json:"metricsTimeDuration,omitempty"`

// ScaleOutThreshold describe the consecutive threshold for the auto-scaling,
// if the consecutive counts of the scale-out result in auto-scaling reach this number,
Expand Down