From c48d54188fc19251d65e716b880e9e151bf07874 Mon Sep 17 00:00:00 2001 From: ti-srebot <66930949+ti-srebot@users.noreply.github.com> Date: Sun, 27 Dec 2020 20:26:31 +0800 Subject: [PATCH] cherry pick #3657 to release-1.1 (#3658) Signed-off-by: ti-srebot Co-authored-by: Yilong Li --- charts/tidb-cluster/values.yaml | 2 +- charts/tidb-operator/values.yaml | 4 ++-- deploy/aliyun/variables.tf | 2 +- deploy/aws/variables.tf | 2 +- deploy/gcp/variables.tf | 2 +- examples/advanced/tidb-cluster.yaml | 12 ++++++------ examples/dm/dm-monitor.yaml | 26 ++++++++++++++++++++++++++ hack/bump-version.sh | 4 ++-- 8 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 examples/dm/dm-monitor.yaml diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml index 68b21d1208b..79c537010bc 100644 --- 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 index dae5f39c81a..6ad0dfcda93 100644 --- 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 index d43f69aa6a2..a80f71ceb60 100644 --- 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 index aee2e5df750..c4096c5de1a 100644 --- 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 index ed0e270827d..ece6ad66705 100644 --- 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 index 38e9f680289..d6748d4c439 100644 --- 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 new file mode 100644 index 00000000000..4728df944b5 --- /dev/null +++ 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 index b73815327e4..a7fec9f82e5 100755 --- 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"