cherry pick #4105 to release-1.2 (#4106)

Signed-off-by: ti-srebot <[email protected]> Co-authored-by: Shiori <[email protected]>
pingcap · Jul 29, 2021 · 824d648 · 824d648
1 parent a0225d9
commit 824d648
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml
@@ -38,7 +38,7 @@ services:
     type: ClusterIP
 
 discovery:
-  image: pingcap/tidb-operator:v1.2.0-rc.2
+  image: pingcap/tidb-operator:v1.2.0
   imagePullPolicy: IfNotPresent
   resources:
     limits:

diff --git a/charts/tidb-operator/values.yaml b/charts/tidb-operator/values.yaml
@@ -12,12 +12,12 @@ rbac:
 timezone: UTC
 
 # operatorImage is TiDB Operator image
-operatorImage: pingcap/tidb-operator:v1.2.0-rc.2
+operatorImage: pingcap/tidb-operator:v1.2.0
 imagePullPolicy: IfNotPresent
 # imagePullSecrets: []
 
 # tidbBackupManagerImage is tidb backup manager image
-tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.2.0-rc.2
+tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.2.0
 
 #
 # Enable or disable tidb-operator features:

diff --git a/deploy/aliyun/variables.tf b/deploy/aliyun/variables.tf
@@ -10,7 +10,7 @@ variable "bastion_cpu_core_count" {
 
 variable "operator_version" {
   type    = string
-  default = "v1.2.0-rc.2"
+  default = "v1.2.0"
 }
 
 variable "operator_helm_values" {

diff --git a/deploy/aws/variables.tf b/deploy/aws/variables.tf
@@ -19,7 +19,7 @@ variable "eks_version" {
 
 variable "operator_version" {
   description = "TiDB operator version"
-  default     = "v1.2.0-rc.2"
+  default     = "v1.2.0"
 }
 
 variable "operator_values" {

diff --git a/deploy/gcp/variables.tf b/deploy/gcp/variables.tf
@@ -28,7 +28,7 @@ variable "tidb_version" {
 }
 
 variable "tidb_operator_version" {
-  default = "v1.2.0-rc.2"
+  default = "v1.2.0"
 }
 
 variable "tidb_operator_chart_version" {

diff --git a/hack/bump-version.sh b/hack/bump-version.sh
@@ -22,8 +22,8 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 fi
 
 # parameters
-OPERATOR_OLD="v1\.2\.0-rc\.1"
-OPERATOR_NEW="v1\.2\.0-rc\.2"
+OPERATOR_OLD="v1\.2\.0-rc\.2"
+OPERATOR_NEW="v1\.2\.0"
 TIDB_OLD="v5\.0\.1"
 TIDB_NEW="v5\.1\.0"
 DM_OLD="v2.0.3"