From 1b64ac6c5518a6178441be2298fe32aa7be648f1 Mon Sep 17 00:00:00 2001 From: ti-srebot <66930949+ti-srebot@users.noreply.github.com> Date: Wed, 27 Jan 2021 14:25:43 +0800 Subject: [PATCH] Bump TiDB version to v4.0.10 (#3757) (#3758) * cherry pick #3757 to release-1.1 Signed-off-by: ti-srebot * Update hack/bump-version.sh Co-authored-by: BinChen Co-authored-by: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com> --- charts/tidb-cluster/values.yaml | 14 +++++++------- charts/tidb-drainer/values.yaml | 2 +- charts/tidb-lightning/values.yaml | 2 +- charts/tikv-importer/values.yaml | 2 +- deploy/aliyun/manifests/db-monitor.yaml.example | 2 +- deploy/aliyun/manifests/db.yaml.example | 2 +- deploy/aliyun/variables.tf | 2 +- deploy/aws/manifests/db-monitor.yaml.example | 2 +- deploy/aws/manifests/db.yaml.example | 2 +- deploy/aws/variables.tf | 2 +- deploy/gcp/manifests/db-monitor.yaml.example | 2 +- deploy/gcp/manifests/db.yaml.example | 2 +- deploy/gcp/variables.tf | 2 +- deploy/modules/aliyun/tidb-cluster/variables.tf | 2 +- deploy/modules/aws/tidb-cluster/variables.tf | 2 +- deploy/modules/gcp/tidb-cluster/variables.tf | 2 +- .../share/tidb-cluster-release/variables.tf | 2 +- .../tidb-cluster-scaled.yaml | 2 +- examples/advanced-statefulset/tidb-cluster.yaml | 2 +- examples/advanced/tidb-cluster.yaml | 16 ++++++++-------- examples/auto-scale/tidb-cluster.yaml | 2 +- examples/auto-scale/tidb-monitor.yaml | 2 +- examples/aws/tidb-cluster.yaml | 2 +- examples/aws/tidb-monitor.yaml | 2 +- examples/basic-cn/tidb-cluster.yaml | 2 +- examples/basic-cn/tidb-monitor.yaml | 2 +- examples/basic-tls/tidb-cluster.yaml | 2 +- examples/basic-tls/tidb-monitor.yaml | 2 +- examples/basic/tidb-cluster.yaml | 2 +- examples/basic/tidb-monitor.yaml | 2 +- examples/dm/dm-monitor.yaml | 2 +- examples/gcp/tidb-cluster.yaml | 2 +- examples/gcp/tidb-monitor.yaml | 2 +- .../heterogeneous-tls/heterogeneous-cluster.yaml | 4 ++-- examples/heterogeneous-tls/tidb-cluster.yaml | 2 +- examples/heterogeneous-tls/tidb-monitor.yaml | 2 +- .../heterogeneous/heterogeneous-cluster.yaml | 2 +- examples/heterogeneous/tidb-cluster.yaml | 2 +- examples/heterogeneous/tidb-monitor.yaml | 2 +- examples/initialize/tidb-cluster.yaml | 2 +- .../ns1-cluster.yaml | 2 +- .../ns2-cluster.yaml | 2 +- .../tidb-monitor.yaml | 2 +- .../monitor-prom-remotewrite/tidb-monitor.yaml | 2 +- .../tidb-monitor.yaml | 2 +- examples/multi-cluster/tidb-cluster-1.yaml | 2 +- examples/multi-cluster/tidb-cluster-2.yaml | 2 +- examples/multiple-pv-tikv/tidb-cluster.yaml | 2 +- examples/selfsigned-tls/tidb-cluster.yaml | 2 +- examples/tiflash/tidb-cluster.yaml | 2 +- examples/tiflash/tidb-monitor.yaml | 2 +- hack/bump-version.sh | 4 ++-- images/tidb-backup-manager/Dockerfile | 2 +- 53 files changed, 68 insertions(+), 68 deletions(-) diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml index 025388dd0b7..d14e29ade14 100644 --- a/charts/tidb-cluster/values.yaml +++ b/charts/tidb-cluster/values.yaml @@ -108,7 +108,7 @@ pd: # annotations: {} "" # portName: "client" replicas: 3 - image: pingcap/pd:v4.0.9 + image: pingcap/pd:v4.0.10 # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. # different classes might map to quality-of-service levels, or to backup policies, # or to arbitrary policies determined by the cluster administrators. @@ -255,7 +255,7 @@ tikv: # we can only set capacity in tikv.resources.limits.storage. replicas: 3 - image: pingcap/tikv:v4.0.9 + image: pingcap/tikv:v4.0.10 # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. # different classes might map to quality-of-service levels, or to backup policies, # or to arbitrary policies determined by the cluster administrators. @@ -352,7 +352,7 @@ tidb: # initSqlConfigMapName: tidb-initsql # initSql: |- # create database app; - image: pingcap/tidb:v4.0.9 + image: pingcap/tidb:v4.0.10 # Image pull policy. imagePullPolicy: IfNotPresent @@ -506,7 +506,7 @@ monitor: storageClassName: local-storage storage: 10Gi initializer: - image: pingcap/tidb-monitor-initializer:v4.0.9 + image: pingcap/tidb-monitor-initializer:v4.0.10 imagePullPolicy: IfNotPresent config: K8S_PROMETHEUS_URL: http://prometheus-k8s.monitoring.svc:9090 @@ -592,7 +592,7 @@ binlog: pump: create: false replicas: 1 - image: pingcap/tidb-binlog:v4.0.9 + image: pingcap/tidb-binlog:v4.0.10 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. @@ -661,7 +661,7 @@ binlog: drainer: create: false - image: pingcap/tidb-binlog:v4.0.9 + image: pingcap/tidb-binlog:v4.0.10 imagePullPolicy: IfNotPresent logLevel: info # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer. @@ -826,7 +826,7 @@ scheduledBackup: importer: create: false - image: pingcap/tidb-lightning:v4.0.9 + image: pingcap/tidb-lightning:v4.0.10 imagePullPolicy: IfNotPresent storageClassName: local-storage storage: 200Gi diff --git a/charts/tidb-drainer/values.yaml b/charts/tidb-drainer/values.yaml index 40218b2c21f..b6e781d6852 100644 --- a/charts/tidb-drainer/values.yaml +++ b/charts/tidb-drainer/values.yaml @@ -12,7 +12,7 @@ timezone: UTC # clusterName is the TiDB cluster name that should backup from or restore to. clusterName: demo -clusterVersion: v4.0.9 +clusterVersion: v4.0.10 baseImage: pingcap/tidb-binlog imagePullPolicy: IfNotPresent diff --git a/charts/tidb-lightning/values.yaml b/charts/tidb-lightning/values.yaml index 212bd05752a..48750185dad 100644 --- a/charts/tidb-lightning/values.yaml +++ b/charts/tidb-lightning/values.yaml @@ -5,7 +5,7 @@ # timezone is the default system timzone timezone: UTC -image: pingcap/tidb-lightning:v4.0.9 +image: pingcap/tidb-lightning:v4.0.10 imagePullPolicy: IfNotPresent # imagePullSecrets: [] diff --git a/charts/tikv-importer/values.yaml b/charts/tikv-importer/values.yaml index c92ec6fb30f..f3f788b4518 100644 --- a/charts/tikv-importer/values.yaml +++ b/charts/tikv-importer/values.yaml @@ -8,7 +8,7 @@ timezone: UTC # clusterName is the TiDB cluster name clusterName: demo -image: pingcap/tidb-lightning:v4.0.9 +image: pingcap/tidb-lightning:v4.0.10 imagePullPolicy: IfNotPresent # imagePullSecrets: [] diff --git a/deploy/aliyun/manifests/db-monitor.yaml.example b/deploy/aliyun/manifests/db-monitor.yaml.example index 3f28c757c6d..8461154c52b 100644 --- a/deploy/aliyun/manifests/db-monitor.yaml.example +++ b/deploy/aliyun/manifests/db-monitor.yaml.example @@ -46,7 +46,7 @@ spec: # requests: # cpu: 50m # memory: 64Mi - version: v4.0.9 + version: v4.0.10 kubePrometheusURL: "" nodeSelector: {} persistent: true diff --git a/deploy/aliyun/manifests/db.yaml.example b/deploy/aliyun/manifests/db.yaml.example index 1f30dcf8760..52d9f2b7528 100644 --- a/deploy/aliyun/manifests/db.yaml.example +++ b/deploy/aliyun/manifests/db.yaml.example @@ -109,4 +109,4 @@ spec: timezone: UTC tlsCluster: enabled: false - version: v4.0.9 + version: v4.0.10 diff --git a/deploy/aliyun/variables.tf b/deploy/aliyun/variables.tf index a5b9c1ef9e6..17423f4c3df 100644 --- a/deploy/aliyun/variables.tf +++ b/deploy/aliyun/variables.tf @@ -36,7 +36,7 @@ variable "cluster_name" { variable "tidb_version" { description = "TiDB cluster version" - default = "v4.0.9" + default = "v4.0.10" } variable "tidb_cluster_chart_version" { description = "tidb-cluster chart version" diff --git a/deploy/aws/manifests/db-monitor.yaml.example b/deploy/aws/manifests/db-monitor.yaml.example index afea050ea6e..fcef75bb796 100644 --- a/deploy/aws/manifests/db-monitor.yaml.example +++ b/deploy/aws/manifests/db-monitor.yaml.example @@ -44,7 +44,7 @@ spec: # requests: # cpu: 50m # memory: 64Mi - version: v4.0.9 + version: v4.0.10 kubePrometheusURL: "" nodeSelector: {} persistent: true diff --git a/deploy/aws/manifests/db.yaml.example b/deploy/aws/manifests/db.yaml.example index d79ba8ac36f..ef8caff6a3b 100644 --- a/deploy/aws/manifests/db.yaml.example +++ b/deploy/aws/manifests/db.yaml.example @@ -109,4 +109,4 @@ spec: timezone: UTC tlsCluster: enabled: false - version: v4.0.9 + version: v4.0.10 diff --git a/deploy/aws/variables.tf b/deploy/aws/variables.tf index 16ec9b7a490..03a1086af8e 100644 --- a/deploy/aws/variables.tf +++ b/deploy/aws/variables.tf @@ -80,7 +80,7 @@ variable "bastion_instance_type" { # For aws tutorials compatiablity variable "default_cluster_version" { - default = "v4.0.9" + default = "v4.0.10" } variable "default_cluster_pd_count" { diff --git a/deploy/gcp/manifests/db-monitor.yaml.example b/deploy/gcp/manifests/db-monitor.yaml.example index a2cabf2e61f..ec943a2d426 100644 --- a/deploy/gcp/manifests/db-monitor.yaml.example +++ b/deploy/gcp/manifests/db-monitor.yaml.example @@ -44,7 +44,7 @@ spec: # requests: # cpu: 50m # memory: 64Mi - version: v4.0.9 + version: v4.0.10 kubePrometheusURL: "" nodeSelector: {} persistent: true diff --git a/deploy/gcp/manifests/db.yaml.example b/deploy/gcp/manifests/db.yaml.example index d1b0815bede..bac771e2415 100644 --- a/deploy/gcp/manifests/db.yaml.example +++ b/deploy/gcp/manifests/db.yaml.example @@ -3,7 +3,7 @@ kind: TidbCluster metadata: name: CLUSTER_NAME spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain schedulerName: tidb-scheduler diff --git a/deploy/gcp/variables.tf b/deploy/gcp/variables.tf index 3f2662bf964..bf1080d5d2d 100644 --- a/deploy/gcp/variables.tf +++ b/deploy/gcp/variables.tf @@ -24,7 +24,7 @@ variable "node_locations" { variable "tidb_version" { description = "TiDB version" - default = "v4.0.9" + default = "v4.0.10" } variable "tidb_operator_version" { diff --git a/deploy/modules/aliyun/tidb-cluster/variables.tf b/deploy/modules/aliyun/tidb-cluster/variables.tf index 6511e0a7179..97c76f73656 100644 --- a/deploy/modules/aliyun/tidb-cluster/variables.tf +++ b/deploy/modules/aliyun/tidb-cluster/variables.tf @@ -12,7 +12,7 @@ variable "image_id" { variable "tidb_version" { description = "TiDB cluster version" - default = "v4.0.9" + default = "v4.0.10" } variable "tidb_cluster_chart_version" { diff --git a/deploy/modules/aws/tidb-cluster/variables.tf b/deploy/modules/aws/tidb-cluster/variables.tf index 0b8fe5bc48c..8f2fc7f3c95 100644 --- a/deploy/modules/aws/tidb-cluster/variables.tf +++ b/deploy/modules/aws/tidb-cluster/variables.tf @@ -19,7 +19,7 @@ variable "cluster_name" { variable "cluster_version" { type = string - default = "v4.0.9" + default = "v4.0.10" } variable "ssh_key_name" { diff --git a/deploy/modules/gcp/tidb-cluster/variables.tf b/deploy/modules/gcp/tidb-cluster/variables.tf index ee9fb7c687e..eb3c7b2c2f7 100644 --- a/deploy/modules/gcp/tidb-cluster/variables.tf +++ b/deploy/modules/gcp/tidb-cluster/variables.tf @@ -9,7 +9,7 @@ variable "tidb_operator_id" { variable "cluster_name" {} variable "cluster_version" { description = "The TiDB cluster version" - default = "v4.0.9" + default = "v4.0.10" } variable "tidb_cluster_chart_version" { description = "The TiDB cluster chart version" diff --git a/deploy/modules/share/tidb-cluster-release/variables.tf b/deploy/modules/share/tidb-cluster-release/variables.tf index 123a47f0b43..298e31f4b3c 100644 --- a/deploy/modules/share/tidb-cluster-release/variables.tf +++ b/deploy/modules/share/tidb-cluster-release/variables.tf @@ -20,7 +20,7 @@ variable "cluster_name" { variable "cluster_version" { type = string - default = "v4.0.9" + default = "v4.0.10" } variable "pd_count" { diff --git a/examples/advanced-statefulset/tidb-cluster-scaled.yaml b/examples/advanced-statefulset/tidb-cluster-scaled.yaml index 80cff658bda..66a7346d32c 100644 --- a/examples/advanced-statefulset/tidb-cluster-scaled.yaml +++ b/examples/advanced-statefulset/tidb-cluster-scaled.yaml @@ -5,7 +5,7 @@ metadata: tikv.tidb.pingcap.com/delete-slots: '[1]' name: asts spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/advanced-statefulset/tidb-cluster.yaml b/examples/advanced-statefulset/tidb-cluster.yaml index 49c137163f7..81c17677f67 100644 --- a/examples/advanced-statefulset/tidb-cluster.yaml +++ b/examples/advanced-statefulset/tidb-cluster.yaml @@ -3,7 +3,7 @@ kind: TidbCluster metadata: name: asts spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/advanced/tidb-cluster.yaml b/examples/advanced/tidb-cluster.yaml index f49cdb8c3e2..7b8883ccc8e 100644 --- a/examples/advanced/tidb-cluster.yaml +++ b/examples/advanced/tidb-cluster.yaml @@ -10,7 +10,7 @@ spec: ####################### ## TiDB cluster version - version: "v4.0.9" + version: "v4.0.10" ## Time zone of TiDB cluster Pods timezone: UTC @@ -183,7 +183,7 @@ spec: ############################# ## The following block overwrites TiDB cluster-level configurations in `spec` - # version: "v4.0.9" + # version: "v4.0.10" # imagePullPolicy: IfNotPresent # imagePullSecrets: secretName # hostNetwork: false @@ -364,7 +364,7 @@ spec: ############################### ## The following block overwrites TiDB cluster-level configurations in `spec` - # version: "v4.0.9" + # version: "v4.0.10" # imagePullPolicy: IfNotPresent # imagePullSecrets: secretName # hostNetwork: false @@ -446,7 +446,7 @@ spec: ## - `command`, which uses curl to access the /status path on port 10080 of the pod ## This is supported from TiDB Operator v1.1.7 # readinessProbe: - # # The `command` type is only supported after tidb v4.0.9, ref: https://github.com/pingcap/tidb/pull/20694 + # # The `command` type is only supported after tidb v4.0.10, ref: https://github.com/pingcap/tidb/pull/20694 # type: command ## when enabled, TiDB will accept TLS encrypted connections from MySQL client @@ -563,7 +563,7 @@ spec: ############################### ## The following block overwrites TiDB cluster-level configurations in `spec` - # version: "v4.0.9" + # version: "v4.0.10" # 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.9" + # version: "v4.0.10" # 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.9" + # version: "v4.0.10" # replicas: 3 # storageClassName: local-storage # requests: @@ -788,7 +788,7 @@ spec: # # Basic TiFlash Configuration # # ############################### # baseImage: pingcap/tiflash - # version: "v4.0.9" + # version: "v4.0.10" # replicas: 1 # # limits: # # cpu: 2000m diff --git a/examples/auto-scale/tidb-cluster.yaml b/examples/auto-scale/tidb-cluster.yaml index d345566124c..6e9699a5e3b 100644 --- a/examples/auto-scale/tidb-cluster.yaml +++ b/examples/auto-scale/tidb-cluster.yaml @@ -3,7 +3,7 @@ kind: TidbCluster metadata: name: auto-scaling-demo spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/auto-scale/tidb-monitor.yaml b/examples/auto-scale/tidb-monitor.yaml index 84b39e9272d..d98776ccce5 100644 --- a/examples/auto-scale/tidb-monitor.yaml +++ b/examples/auto-scale/tidb-monitor.yaml @@ -13,7 +13,7 @@ spec: version: 6.1.6 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.9 + version: v4.0.10 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/aws/tidb-cluster.yaml b/examples/aws/tidb-cluster.yaml index ce23130b906..776013d4240 100644 --- a/examples/aws/tidb-cluster.yaml +++ b/examples/aws/tidb-cluster.yaml @@ -3,7 +3,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC configUpdateStrategy: RollingUpdate pvReclaimPolicy: Retain diff --git a/examples/aws/tidb-monitor.yaml b/examples/aws/tidb-monitor.yaml index f82c59e08a1..e32b4a19584 100644 --- a/examples/aws/tidb-monitor.yaml +++ b/examples/aws/tidb-monitor.yaml @@ -30,7 +30,7 @@ spec: initializer: baseImage: pingcap/tidb-monitor-initializer imagePullPolicy: IfNotPresent - version: v4.0.9 + version: v4.0.10 kubePrometheusURL: "" persistent: true prometheus: diff --git a/examples/basic-cn/tidb-cluster.yaml b/examples/basic-cn/tidb-cluster.yaml index 7226df5a245..88f4e28a8cc 100644 --- a/examples/basic-cn/tidb-cluster.yaml +++ b/examples/basic-cn/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/basic-cn/tidb-monitor.yaml b/examples/basic-cn/tidb-monitor.yaml index 35ba196d918..26eb2e71e46 100644 --- a/examples/basic-cn/tidb-monitor.yaml +++ b/examples/basic-cn/tidb-monitor.yaml @@ -13,7 +13,7 @@ spec: version: 6.1.6 initializer: baseImage: registry.cn-beijing.aliyuncs.com/tidb/tidb-monitor-initializer - version: v4.0.9 + version: v4.0.10 reloader: baseImage: registry.cn-beijing.aliyuncs.com/tidb/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/basic-tls/tidb-cluster.yaml b/examples/basic-tls/tidb-cluster.yaml index 60c66e816b2..d57d6caf512 100644 --- a/examples/basic-tls/tidb-cluster.yaml +++ b/examples/basic-tls/tidb-cluster.yaml @@ -8,7 +8,7 @@ metadata: spec: tlsCluster: enabled: true - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Delete enableDynamicConfiguration: true diff --git a/examples/basic-tls/tidb-monitor.yaml b/examples/basic-tls/tidb-monitor.yaml index 18e200ee904..a8f37092733 100644 --- a/examples/basic-tls/tidb-monitor.yaml +++ b/examples/basic-tls/tidb-monitor.yaml @@ -13,7 +13,7 @@ spec: version: 6.1.6 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.9 + version: v4.0.10 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/basic/tidb-cluster.yaml b/examples/basic/tidb-cluster.yaml index 12d4f4cb687..91aae5e2b6d 100644 --- a/examples/basic/tidb-cluster.yaml +++ b/examples/basic/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/basic/tidb-monitor.yaml b/examples/basic/tidb-monitor.yaml index 4912d6d0c90..590b0a8b0cb 100644 --- a/examples/basic/tidb-monitor.yaml +++ b/examples/basic/tidb-monitor.yaml @@ -13,7 +13,7 @@ spec: version: 6.1.6 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.9 + version: v4.0.10 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/dm/dm-monitor.yaml b/examples/dm/dm-monitor.yaml index 4728df944b5..b049a7474ad 100644 --- a/examples/dm/dm-monitor.yaml +++ b/examples/dm/dm-monitor.yaml @@ -13,7 +13,7 @@ spec: version: 6.1.6 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.9 + version: v4.0.10 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/gcp/tidb-cluster.yaml b/examples/gcp/tidb-cluster.yaml index 023da1c40c0..8de33ccd5e5 100644 --- a/examples/gcp/tidb-cluster.yaml +++ b/examples/gcp/tidb-cluster.yaml @@ -3,7 +3,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC configUpdateStrategy: RollingUpdate pvReclaimPolicy: Retain diff --git a/examples/gcp/tidb-monitor.yaml b/examples/gcp/tidb-monitor.yaml index f82c59e08a1..e32b4a19584 100644 --- a/examples/gcp/tidb-monitor.yaml +++ b/examples/gcp/tidb-monitor.yaml @@ -30,7 +30,7 @@ spec: initializer: baseImage: pingcap/tidb-monitor-initializer imagePullPolicy: IfNotPresent - version: v4.0.9 + version: v4.0.10 kubePrometheusURL: "" persistent: true prometheus: diff --git a/examples/heterogeneous-tls/heterogeneous-cluster.yaml b/examples/heterogeneous-tls/heterogeneous-cluster.yaml index 641bc87c1fe..f728cc129ef 100644 --- a/examples/heterogeneous-tls/heterogeneous-cluster.yaml +++ b/examples/heterogeneous-tls/heterogeneous-cluster.yaml @@ -10,7 +10,7 @@ spec: enabled: true configUpdateStrategy: RollingUpdate enableDynamicConfiguration: true - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain discovery: {} @@ -38,7 +38,7 @@ spec: enabled: true tiflash: baseImage: pingcap/tiflash - version: v4.0.9 + version: v4.0.10 maxFailoverCount: 1 replicas: 1 storageClaims: diff --git a/examples/heterogeneous-tls/tidb-cluster.yaml b/examples/heterogeneous-tls/tidb-cluster.yaml index 35fbdade1b9..f6be77554c6 100644 --- a/examples/heterogeneous-tls/tidb-cluster.yaml +++ b/examples/heterogeneous-tls/tidb-cluster.yaml @@ -8,7 +8,7 @@ metadata: spec: tlsCluster: enabled: true - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous-tls/tidb-monitor.yaml b/examples/heterogeneous-tls/tidb-monitor.yaml index 124d54b64cb..be693611742 100644 --- a/examples/heterogeneous-tls/tidb-monitor.yaml +++ b/examples/heterogeneous-tls/tidb-monitor.yaml @@ -14,7 +14,7 @@ spec: version: 6.1.6 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.9 + version: v4.0.10 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/heterogeneous/heterogeneous-cluster.yaml b/examples/heterogeneous/heterogeneous-cluster.yaml index 13ceaa6ee80..4115f4445f6 100644 --- a/examples/heterogeneous/heterogeneous-cluster.yaml +++ b/examples/heterogeneous/heterogeneous-cluster.yaml @@ -7,7 +7,7 @@ metadata: name: heterogeneous spec: configUpdateStrategy: RollingUpdate - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous/tidb-cluster.yaml b/examples/heterogeneous/tidb-cluster.yaml index 63b3d0af4a7..e65ba5847b3 100644 --- a/examples/heterogeneous/tidb-cluster.yaml +++ b/examples/heterogeneous/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous/tidb-monitor.yaml b/examples/heterogeneous/tidb-monitor.yaml index 4ad26c7a73a..70e7884b886 100644 --- a/examples/heterogeneous/tidb-monitor.yaml +++ b/examples/heterogeneous/tidb-monitor.yaml @@ -14,7 +14,7 @@ spec: version: 6.1.6 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.9 + version: v4.0.10 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/initialize/tidb-cluster.yaml b/examples/initialize/tidb-cluster.yaml index 2ab5cee3eff..31e3e15323b 100644 --- a/examples/initialize/tidb-cluster.yaml +++ b/examples/initialize/tidb-cluster.yaml @@ -3,7 +3,7 @@ kind: TidbCluster metadata: name: initialize-demo spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/monitor-multiple-cluster-non-tls/ns1-cluster.yaml b/examples/monitor-multiple-cluster-non-tls/ns1-cluster.yaml index d8a6fca83c4..e94c8ddeba4 100644 --- a/examples/monitor-multiple-cluster-non-tls/ns1-cluster.yaml +++ b/examples/monitor-multiple-cluster-non-tls/ns1-cluster.yaml @@ -7,7 +7,7 @@ metadata: name: ns1 namespace: ns1 spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/monitor-multiple-cluster-non-tls/ns2-cluster.yaml b/examples/monitor-multiple-cluster-non-tls/ns2-cluster.yaml index da050613ce6..7d37a194c35 100644 --- a/examples/monitor-multiple-cluster-non-tls/ns2-cluster.yaml +++ b/examples/monitor-multiple-cluster-non-tls/ns2-cluster.yaml @@ -7,7 +7,7 @@ metadata: name: ns2 namespace: ns2 spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/monitor-multiple-cluster-non-tls/tidb-monitor.yaml b/examples/monitor-multiple-cluster-non-tls/tidb-monitor.yaml index 2415b7379ba..87c0aeda68c 100644 --- a/examples/monitor-multiple-cluster-non-tls/tidb-monitor.yaml +++ b/examples/monitor-multiple-cluster-non-tls/tidb-monitor.yaml @@ -17,7 +17,7 @@ spec: version: 6.1.6 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.9 + version: v4.0.10 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/monitor-prom-remotewrite/tidb-monitor.yaml b/examples/monitor-prom-remotewrite/tidb-monitor.yaml index 06123db6646..f5c79b37342 100644 --- a/examples/monitor-prom-remotewrite/tidb-monitor.yaml +++ b/examples/monitor-prom-remotewrite/tidb-monitor.yaml @@ -22,7 +22,7 @@ spec: version: 6.1.6 initializer: baseImage: registry.cn-beijing.aliyuncs.com/tidb/tidb-monitor-initializer - version: v4.0.9 + version: v4.0.10 reloader: baseImage: registry.cn-beijing.aliyuncs.com/tidb/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/monitor-with-externalConfigMap/tidb-monitor.yaml b/examples/monitor-with-externalConfigMap/tidb-monitor.yaml index db457ac9dff..276b630a7a1 100644 --- a/examples/monitor-with-externalConfigMap/tidb-monitor.yaml +++ b/examples/monitor-with-externalConfigMap/tidb-monitor.yaml @@ -20,7 +20,7 @@ spec: version: 6.1.6 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.9 + version: v4.0.10 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/multi-cluster/tidb-cluster-1.yaml b/examples/multi-cluster/tidb-cluster-1.yaml index b56bdb3d8fa..adea31510b5 100644 --- a/examples/multi-cluster/tidb-cluster-1.yaml +++ b/examples/multi-cluster/tidb-cluster-1.yaml @@ -4,7 +4,7 @@ metadata: name: cluster1 namespace: pingcap spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/examples/multi-cluster/tidb-cluster-2.yaml b/examples/multi-cluster/tidb-cluster-2.yaml index cc42de622e5..e7dccc0c3bd 100644 --- a/examples/multi-cluster/tidb-cluster-2.yaml +++ b/examples/multi-cluster/tidb-cluster-2.yaml @@ -4,7 +4,7 @@ metadata: name: cluster2 namespace: pingcap spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/examples/multiple-pv-tikv/tidb-cluster.yaml b/examples/multiple-pv-tikv/tidb-cluster.yaml index 725f5136dd8..7f5d4a57ab8 100644 --- a/examples/multiple-pv-tikv/tidb-cluster.yaml +++ b/examples/multiple-pv-tikv/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/examples/selfsigned-tls/tidb-cluster.yaml b/examples/selfsigned-tls/tidb-cluster.yaml index 3523c375e23..14cdfc54d11 100644 --- a/examples/selfsigned-tls/tidb-cluster.yaml +++ b/examples/selfsigned-tls/tidb-cluster.yaml @@ -3,7 +3,7 @@ kind: TidbCluster metadata: name: tls spec: - version: v4.0.9 + version: v4.0.10 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/tiflash/tidb-cluster.yaml b/examples/tiflash/tidb-cluster.yaml index 405900bff29..5033d047d6a 100644 --- a/examples/tiflash/tidb-cluster.yaml +++ b/examples/tiflash/tidb-cluster.yaml @@ -71,4 +71,4 @@ spec: storage: 10Gi storageClassName: local-storage timezone: UTC - version: v4.0.9 + version: v4.0.10 diff --git a/examples/tiflash/tidb-monitor.yaml b/examples/tiflash/tidb-monitor.yaml index 07f0e5f5be3..178db6da845 100644 --- a/examples/tiflash/tidb-monitor.yaml +++ b/examples/tiflash/tidb-monitor.yaml @@ -15,7 +15,7 @@ spec: type: NodePort initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.9 + version: v4.0.10 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/hack/bump-version.sh b/hack/bump-version.sh index 609d9d08bbb..3c905269818 100755 --- a/hack/bump-version.sh +++ b/hack/bump-version.sh @@ -24,8 +24,8 @@ fi # parameters OPERATOR_OLD="v1\.1\.9" OPERATOR_NEW="v1\.1\.10" -TIDB_OLD="v4\.0\.8" -TIDB_NEW="v4\.0\.9" +TIDB_OLD="v4\.0\.9" +TIDB_NEW="v4\.0\.10" find ./deploy -name "*\.tf"| xargs $SED_BIN -i "s/$OPERATOR_OLD/$OPERATOR_NEW/g" find ./charts -name "*\.yaml"| xargs $SED_BIN -i "s/$OPERATOR_OLD/$OPERATOR_NEW/g" diff --git a/images/tidb-backup-manager/Dockerfile b/images/tidb-backup-manager/Dockerfile index 35913436f7a..913721c3d00 100644 --- a/images/tidb-backup-manager/Dockerfile +++ b/images/tidb-backup-manager/Dockerfile @@ -1,7 +1,7 @@ FROM pingcap/tidb-enterprise-tools:latest ARG RCLONE_VERSION=v1.51.0 ARG SHUSH_VERSION=v1.4.0 -ARG TOOLKIT_V40=v4.0.9 +ARG TOOLKIT_V40=v4.0.10 RUN apk update && apk add ca-certificates RUN wget -nv https://github.com/ncw/rclone/releases/download/${RCLONE_VERSION}/rclone-${RCLONE_VERSION}-linux-amd64.zip \