Skip to content

Commit

Permalink
cherry pick #4481 to release-1.3 (#4482)
Browse files Browse the repository at this point in the history
Signed-off-by: ti-srebot <[email protected]>

Co-authored-by: Justin Huang <[email protected]>
  • Loading branch information
ti-srebot and just1900 authored Mar 17, 2022
1 parent d7b1bf6 commit 019c90c
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion charts/tidb-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
type: ClusterIP

discovery:
image: pingcap/tidb-operator:v1.3.1
image: pingcap/tidb-operator:v1.3.2
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down
4 changes: 2 additions & 2 deletions charts/tidb-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ rbac:
timezone: UTC

# operatorImage is TiDB Operator image
operatorImage: pingcap/tidb-operator:v1.3.1
operatorImage: pingcap/tidb-operator:v1.3.2
imagePullPolicy: IfNotPresent
# imagePullSecrets: []

# tidbBackupManagerImage is tidb backup manager image
tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.3.1
tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.3.2

#
# Enable or disable tidb-operator features:
Expand Down
2 changes: 1 addition & 1 deletion deploy/aliyun/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ variable "bastion_cpu_core_count" {

variable "operator_version" {
type = string
default = "v1.3.1"
default = "v1.3.2"
}

variable "operator_helm_values" {
Expand Down
2 changes: 1 addition & 1 deletion deploy/aws/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ variable "eks_version" {

variable "operator_version" {
description = "TiDB operator version"
default = "v1.3.1"
default = "v1.3.2"
}

variable "operator_values" {
Expand Down
2 changes: 1 addition & 1 deletion deploy/gcp/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ variable "tidb_version" {
}

variable "tidb_operator_version" {
default = "v1.3.1"
default = "v1.3.2"
}

variable "tidb_operator_chart_version" {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ require (
github.com/pingcap/errors v0.11.0
github.com/pingcap/kvproto v0.0.0-20200927054727-1290113160f0
github.com/pingcap/tidb v2.1.0-beta+incompatible
github.com/pingcap/tidb-operator/pkg/apis v1.3.1
github.com/pingcap/tidb-operator/pkg/client v1.3.1
github.com/pingcap/tidb-operator/pkg/apis v1.3.2
github.com/pingcap/tidb-operator/pkg/client v1.3.2
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.26.0
Expand Down
4 changes: 2 additions & 2 deletions hack/bump-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
fi

# parameters
OPERATOR_OLD="v1\.3\.0"
OPERATOR_NEW="v1\.3\.1"
OPERATOR_OLD="v1\.3\.1"
OPERATOR_NEW="v1\.3\.2"
TIDB_OLD="v5\.3\.0"
TIDB_NEW="v5\.4\.0"
DM_OLD="v5.3.0"
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/pingcap/tidb-operator/pkg/client
go 1.13

require (
github.com/pingcap/tidb-operator/pkg/apis v1.3.1
github.com/pingcap/tidb-operator/pkg/apis v1.3.2
k8s.io/apimachinery v0.19.16
k8s.io/client-go v0.19.16
)
Expand Down

0 comments on commit 019c90c

Please sign in to comment.