cherry pick pingcap#2842 to release-1.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot · Jul 1, 2020 · 3d76fe0 · 3d76fe0
1 parent 16123b2
commit 3d76fe0
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/CHANGELOG-1.1.md b/CHANGELOG-1.1.md
@@ -1,3 +1,17 @@
+# TiDB Operator v1.1.2 Release Notes
+
+## Action Required
+
+- An incompatible issue with PD 4.0.2 has been fixed. Please upgrade TiDB Operator to v1.1.2 before deploying TiDB 4.0.2 and later versions ([#2809](https://github.com/pingcap/tidb-operator/pull/2809), [@cofyc](https://github.com/cofyc))
+
+## Other Notable Changes
+
+- Collect metrics for TiCDC, TiDB Lightning and TiKV Importer ([#2835](https://github.com/pingcap/tidb-operator/pull/2835), [@weekface](https://github.com/weekface))
+- Update PD/TiDB/TiKV config to v4.0.2 ([#2828](https://github.com/pingcap/tidb-operator/pull/2828), [@DanielZhangQD](https://github.com/DanielZhangQD))
+- Fix the bug that `PD` Member might still exist after scaling-in ([#2793](https://github.com/pingcap/tidb-operator/pull/2793), [@Yisaer](https://github.com/Yisaer))
+- Support Auto-Scaler Reference in `TidbCluster` Status when there exists `TidbClusterAutoScaler` ([#2791](https://github.com/pingcap/tidb-operator/pull/2791), [@Yisaer](https://github.com/Yisaer))
+- Support configuring container lifecycle hooks and `terminationGracePeriodSeconds` in TiDB spec ([#2810](https://github.com/pingcap/tidb-operator/pull/2810), [@weekface](https://github.com/weekface))
+
 # TiDB Operator v1.1.1 Release Notes
 
 ## Notable changes

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.1.1
+  image: pingcap/tidb-operator:v1.1.2
   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.1.1
+operatorImage: pingcap/tidb-operator:v1.1.2
 imagePullPolicy: IfNotPresent
 # imagePullSecrets: []
 
 # tidbBackupManagerImage is tidb backup manager image
-tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.1.1
+tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.1.2
 
 #
 # 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.1.1"
+  default = "v1.1.2"
 }
 
 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.1.1"
+  default     = "v1.1.2"
 }
 
 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.1.1"
+  default = "v1.1.2"
 }
 
 variable "tidb_operator_chart_version" {