cherry pick pingcap#3657 to release-1.1

Signed-off-by: ti-srebot <[email protected]>
ti-srebot · Dec 27, 2020 · a5b5886 · a5b5886
1 parent db89860
commit a5b5886
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 14 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.1.8
+  image: pingcap/tidb-operator:v1.1.9
   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.8
+operatorImage: pingcap/tidb-operator:v1.1.9
 imagePullPolicy: IfNotPresent
 # imagePullSecrets: []
 
 # tidbBackupManagerImage is tidb backup manager image
-tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.1.8
+tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.1.9
 
 #
 # 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.8"
+  default = "v1.1.9"
 }
 
 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.8"
+  default     = "v1.1.9"
 }
 
 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.8"
+  default = "v1.1.9"
 }
 
 variable "tidb_operator_chart_version" {

diff --git a/examples/advanced/tidb-cluster.yaml b/examples/advanced/tidb-cluster.yaml
@@ -183,7 +183,7 @@ spec:
     #############################
 
     ## The following block overwrites TiDB cluster-level configurations in `spec`
-    # version: "v4.0.8"
+    # version: "v4.0.9"
     # imagePullPolicy: IfNotPresent
     # imagePullSecrets: secretName
     # hostNetwork: false
@@ -364,7 +364,7 @@ spec:
     ###############################
 
     ## The following block overwrites TiDB cluster-level configurations in `spec`
-    # version: "v4.0.8"
+    # version: "v4.0.9"
     # imagePullPolicy: IfNotPresent
     # imagePullSecrets: secretName
     # hostNetwork: false
@@ -563,7 +563,7 @@ spec:
     ###############################
 
     ## The following block overwrites TiDB cluster-level configurations in `spec`
-    # version: "v4.0.8"
+    # version: "v4.0.9"
     # imagePullPolicy: IfNotPresent
     # imagePullSecrets: secretName
     # hostNetwork: false
@@ -709,7 +709,7 @@ spec:
   ## Ref: https://pingcap.com/docs/tidb-in-kubernetes/stable/deploy-tidb-binlog/#deploy-pump
   # pump:
   #   baseImage: pingcap/tidb-binlog
-  #   version: "v4.0.8"
+  #   version: "v4.0.9"
   #   replicas: 1
   #   storageClassName: local-storage
   #   requests:
@@ -746,7 +746,7 @@ spec:
   ## Ref: https://pingcap.com/docs/tidb-in-kubernetes/stable/deploy-ticdc/
   # ticdc:
   #   baseImage: pingcap/ticdc
-  #   version: "v4.0.8"
+  #   version: "v4.0.9"
   #   replicas: 3
   #   storageClassName: local-storage
   #   requests:
@@ -788,7 +788,7 @@ spec:
   #   # Basic TiFlash Configuration #
   #   ###############################
   #   baseImage: pingcap/tiflash
-  #   version: "v4.0.8"
+  #   version: "v4.0.9"
   #   replicas: 1
   #   # limits:
   #   #   cpu: 2000m

diff --git a/examples/dm/dm-monitor.yaml b/examples/dm/dm-monitor.yaml
@@ -0,0 +1,26 @@
+apiVersion: pingcap.com/v1alpha1
+kind: TidbMonitor
+metadata:
+  name: basic
+spec:
+  clusters:
+  - name: basic
+  prometheus:
+    baseImage: prom/prometheus
+    version: v2.18.1
+  grafana:
+    baseImage: grafana/grafana
+    version: 6.1.6
+  initializer:
+    baseImage: pingcap/tidb-monitor-initializer
+    version: v4.0.9
+  reloader:
+    baseImage: pingcap/tidb-monitor-reloader
+    version: v1.0.1
+  dm:
+    clusters:
+    - name: basic
+    initializer:
+      baseImage: pingcap/dm-monitor-initializer
+      version: v2.0.0
+  imagePullPolicy: IfNotPresent
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\.1\.7"
-OPERATOR_NEW="v1\.1\.8"
+OPERATOR_OLD="v1\.1\.8"
+OPERATOR_NEW="v1\.1\.9"
 TIDB_OLD="v4\.0\.8"
 TIDB_NEW="v4\.0\.9"