From 8ce0c23e100e49604d1c103ec5031a52779fbb0c Mon Sep 17 00:00:00 2001 From: ti-srebot <66930949+ti-srebot@users.noreply.github.com> Date: Mon, 21 Dec 2020 20:19:30 +0800 Subject: [PATCH] cherry pick #3613 to release-1.1 (#3632) Signed-off-by: ti-srebot Co-authored-by: Yilong Li --- charts/tidb-cluster/values.yaml | 16 ++++---- charts/tidb-drainer/values.yaml | 2 +- charts/tidb-lightning/values.yaml | 2 +- charts/tidb-operator/values.yaml | 4 +- charts/tikv-importer/values.yaml | 2 +- .../aliyun/manifests/db-monitor.yaml.example | 2 +- deploy/aliyun/manifests/db.yaml.example | 2 +- deploy/aliyun/variables.tf | 4 +- deploy/aws/manifests/db-monitor.yaml.example | 2 +- deploy/aws/manifests/db.yaml.example | 2 +- deploy/aws/variables.tf | 4 +- deploy/gcp/manifests/db-monitor.yaml.example | 2 +- deploy/gcp/manifests/db.yaml.example | 2 +- deploy/gcp/variables.tf | 4 +- .../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 +- .../advanced-statefulset/tidb-cluster.yaml | 2 +- examples/advanced/tidb-cluster.yaml | 2 +- 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/tidb-cluster.yaml | 2 +- examples/basic/tidb-monitor.yaml | 2 +- examples/gcp/tidb-cluster.yaml | 2 +- examples/gcp/tidb-monitor.yaml | 2 +- .../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 +- .../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 | 37 +++++++++++++++++++ images/tidb-backup-manager/Dockerfile | 2 +- 50 files changed, 98 insertions(+), 61 deletions(-) create mode 100755 hack/bump-version.sh diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml index c720827fcc..68b21d1208 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.7 + image: pingcap/tidb-operator:v1.1.8 imagePullPolicy: IfNotPresent resources: limits: @@ -108,7 +108,7 @@ pd: # annotations: {} "" # portName: "client" replicas: 3 - image: pingcap/pd:v4.0.8 + image: pingcap/pd:v4.0.9 # 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.8 + image: pingcap/tikv:v4.0.9 # 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.8 + image: pingcap/tidb:v4.0.9 # Image pull policy. imagePullPolicy: IfNotPresent @@ -506,7 +506,7 @@ monitor: storageClassName: local-storage storage: 10Gi initializer: - image: pingcap/tidb-monitor-initializer:v4.0.8 + image: pingcap/tidb-monitor-initializer:v4.0.9 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.8 + image: pingcap/tidb-binlog:v4.0.9 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.8 + image: pingcap/tidb-binlog:v4.0.9 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.8 + image: pingcap/tidb-lightning:v4.0.9 imagePullPolicy: IfNotPresent storageClassName: local-storage storage: 200Gi diff --git a/charts/tidb-drainer/values.yaml b/charts/tidb-drainer/values.yaml index 3df608df50..40218b2c21 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.8 +clusterVersion: v4.0.9 baseImage: pingcap/tidb-binlog imagePullPolicy: IfNotPresent diff --git a/charts/tidb-lightning/values.yaml b/charts/tidb-lightning/values.yaml index 0036e3d98a..460058e638 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.8 +image: pingcap/tidb-lightning:v4.0.9 imagePullPolicy: IfNotPresent # imagePullSecrets: [] diff --git a/charts/tidb-operator/values.yaml b/charts/tidb-operator/values.yaml index dbb3f82860..dae5f39c81 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.7 +operatorImage: pingcap/tidb-operator:v1.1.8 imagePullPolicy: IfNotPresent # imagePullSecrets: [] # tidbBackupManagerImage is tidb backup manager image -tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.1.7 +tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.1.8 # # Enable or disable tidb-operator features: diff --git a/charts/tikv-importer/values.yaml b/charts/tikv-importer/values.yaml index b97027f73a..f7171f22fa 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, if not specified, the chart release name will be used clusterName: demo -image: pingcap/tidb-lightning:v4.0.8 +image: pingcap/tidb-lightning:v4.0.9 imagePullPolicy: IfNotPresent # imagePullSecrets: [] diff --git a/deploy/aliyun/manifests/db-monitor.yaml.example b/deploy/aliyun/manifests/db-monitor.yaml.example index d5ebf878a1..3f28c757c6 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.8 + version: v4.0.9 kubePrometheusURL: "" nodeSelector: {} persistent: true diff --git a/deploy/aliyun/manifests/db.yaml.example b/deploy/aliyun/manifests/db.yaml.example index 33c6b68a22..1f30dcf876 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.8 + version: v4.0.9 diff --git a/deploy/aliyun/variables.tf b/deploy/aliyun/variables.tf index 9e36ec9457..d43f69aa6a 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.7" + default = "v1.1.8" } variable "operator_helm_values" { @@ -36,7 +36,7 @@ variable "cluster_name" { variable "tidb_version" { description = "TiDB cluster version" - default = "v4.0.8" + default = "v4.0.9" } 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 59379e3ae8..afea050ea6 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.8 + version: v4.0.9 kubePrometheusURL: "" nodeSelector: {} persistent: true diff --git a/deploy/aws/manifests/db.yaml.example b/deploy/aws/manifests/db.yaml.example index 6d80ab963f..d79ba8ac36 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.8 + version: v4.0.9 diff --git a/deploy/aws/variables.tf b/deploy/aws/variables.tf index 52262174c4..aee2e5df75 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.7" + default = "v1.1.8" } variable "operator_values" { @@ -80,7 +80,7 @@ variable "bastion_instance_type" { # For aws tutorials compatiablity variable "default_cluster_version" { - default = "v4.0.8" + default = "v4.0.9" } variable "default_cluster_pd_count" { diff --git a/deploy/gcp/manifests/db-monitor.yaml.example b/deploy/gcp/manifests/db-monitor.yaml.example index 328256f78e..a2cabf2e61 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.8 + version: v4.0.9 kubePrometheusURL: "" nodeSelector: {} persistent: true diff --git a/deploy/gcp/manifests/db.yaml.example b/deploy/gcp/manifests/db.yaml.example index a5a016e0d9..d1b0815bed 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Retain schedulerName: tidb-scheduler diff --git a/deploy/gcp/variables.tf b/deploy/gcp/variables.tf index 65bfb2faf1..ed0e270827 100644 --- a/deploy/gcp/variables.tf +++ b/deploy/gcp/variables.tf @@ -24,11 +24,11 @@ variable "node_locations" { variable "tidb_version" { description = "TiDB version" - default = "v4.0.8" + default = "v4.0.9" } variable "tidb_operator_version" { - default = "v1.1.7" + default = "v1.1.8" } variable "tidb_operator_chart_version" { diff --git a/deploy/modules/aliyun/tidb-cluster/variables.tf b/deploy/modules/aliyun/tidb-cluster/variables.tf index f4ad784dcb..6511e0a717 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.8" + default = "v4.0.9" } variable "tidb_cluster_chart_version" { diff --git a/deploy/modules/aws/tidb-cluster/variables.tf b/deploy/modules/aws/tidb-cluster/variables.tf index 90cea51f4c..0b8fe5bc48 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.8" + default = "v4.0.9" } variable "ssh_key_name" { diff --git a/deploy/modules/gcp/tidb-cluster/variables.tf b/deploy/modules/gcp/tidb-cluster/variables.tf index 66fbb7c344..ee9fb7c687 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.8" + default = "v4.0.9" } 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 0b223fd658..123a47f0b4 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.8" + default = "v4.0.9" } variable "pd_count" { diff --git a/examples/advanced-statefulset/tidb-cluster-scaled.yaml b/examples/advanced-statefulset/tidb-cluster-scaled.yaml index e3558fdc00..80cff658bd 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/advanced-statefulset/tidb-cluster.yaml b/examples/advanced-statefulset/tidb-cluster.yaml index 019975b051..49c137163f 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/advanced/tidb-cluster.yaml b/examples/advanced/tidb-cluster.yaml index ef031ceedf..38e9f68028 100644 --- a/examples/advanced/tidb-cluster.yaml +++ b/examples/advanced/tidb-cluster.yaml @@ -10,7 +10,7 @@ spec: ####################### ## TiDB cluster version - version: "v4.0.8" + version: "v4.0.9" ## Time zone of TiDB cluster Pods timezone: UTC diff --git a/examples/auto-scale/tidb-cluster.yaml b/examples/auto-scale/tidb-cluster.yaml index 3fa02a6293..d345566124 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/auto-scale/tidb-monitor.yaml b/examples/auto-scale/tidb-monitor.yaml index 747f510775..84b39e9272 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.8 + version: v4.0.9 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 d902d4e12b..ce23130b90 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.8 + version: v4.0.9 timezone: UTC configUpdateStrategy: RollingUpdate pvReclaimPolicy: Retain diff --git a/examples/aws/tidb-monitor.yaml b/examples/aws/tidb-monitor.yaml index e3cc39fca2..f82c59e08a 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.8 + version: v4.0.9 kubePrometheusURL: "" persistent: true prometheus: diff --git a/examples/basic-cn/tidb-cluster.yaml b/examples/basic-cn/tidb-cluster.yaml index 214b2cd9ae..7226df5a24 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/basic-cn/tidb-monitor.yaml b/examples/basic-cn/tidb-monitor.yaml index 6a0223bcec..35ba196d91 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.8 + version: v4.0.9 reloader: baseImage: registry.cn-beijing.aliyuncs.com/tidb/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/basic/tidb-cluster.yaml b/examples/basic/tidb-cluster.yaml index 2b4b20a2b6..12d4f4cb68 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/basic/tidb-monitor.yaml b/examples/basic/tidb-monitor.yaml index 2cdabb7c26..4912d6d0c9 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.8 + version: v4.0.9 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 0e04719f21..023da1c40c 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.8 + version: v4.0.9 timezone: UTC configUpdateStrategy: RollingUpdate pvReclaimPolicy: Retain diff --git a/examples/gcp/tidb-monitor.yaml b/examples/gcp/tidb-monitor.yaml index e3cc39fca2..f82c59e08a 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.8 + version: v4.0.9 kubePrometheusURL: "" persistent: true prometheus: diff --git a/examples/heterogeneous-tls/heterogeneous-cluster.yaml b/examples/heterogeneous-tls/heterogeneous-cluster.yaml index 8ca45da8e6..641bc87c1f 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Retain discovery: {} @@ -38,7 +38,7 @@ spec: enabled: true tiflash: baseImage: pingcap/tiflash - version: v4.0.8 + version: v4.0.9 maxFailoverCount: 1 replicas: 1 storageClaims: diff --git a/examples/heterogeneous-tls/tidb-cluster.yaml b/examples/heterogeneous-tls/tidb-cluster.yaml index 1c342c19fc..35fbdade1b 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous-tls/tidb-monitor.yaml b/examples/heterogeneous-tls/tidb-monitor.yaml index a67a49b9fd..124d54b64c 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.8 + version: v4.0.9 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 61add2affa..13ceaa6ee8 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous/tidb-cluster.yaml b/examples/heterogeneous/tidb-cluster.yaml index c8e9e2476f..63b3d0af4a 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous/tidb-monitor.yaml b/examples/heterogeneous/tidb-monitor.yaml index fb2a82b142..4ad26c7a73 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.8 + version: v4.0.9 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 e8ff3b4699..2ab5cee3ef 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.8 + version: v4.0.9 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 7783656636..d8a6fca83c 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.8 + version: v4.0.9 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 058942e098..da050613ce 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.8 + version: v4.0.9 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 a6a03aee3b..2415b7379b 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.8 + version: v4.0.9 reloader: baseImage: pingcap/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 5974977599..a0247d26a0 100644 --- a/examples/monitor-with-externalConfigMap/tidb-monitor.yaml +++ b/examples/monitor-with-externalConfigMap/tidb-monitor.yaml @@ -23,7 +23,7 @@ spec: version: 6.1.6 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v4.0.8 + version: v4.0.9 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 ded1c8d37b..b56bdb3d8f 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/examples/multi-cluster/tidb-cluster-2.yaml b/examples/multi-cluster/tidb-cluster-2.yaml index 4fbaa9037c..cc42de622e 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/examples/multiple-pv-tikv/tidb-cluster.yaml b/examples/multiple-pv-tikv/tidb-cluster.yaml index 89028fdafe..725f5136dd 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/examples/selfsigned-tls/tidb-cluster.yaml b/examples/selfsigned-tls/tidb-cluster.yaml index 3d3b210768..3523c375e2 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.8 + version: v4.0.9 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/tiflash/tidb-cluster.yaml b/examples/tiflash/tidb-cluster.yaml index d6a7f7d452..405900bff2 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.8 + version: v4.0.9 diff --git a/examples/tiflash/tidb-monitor.yaml b/examples/tiflash/tidb-monitor.yaml index d8d900bda7..07f0e5f5be 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.8 + version: v4.0.9 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/hack/bump-version.sh b/hack/bump-version.sh new file mode 100755 index 0000000000..b73815327e --- /dev/null +++ b/hack/bump-version.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +# Copyright 2020 PingCAP, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# See the License for the specific language governing permissions and +# limitations under the License. + +set -e + +SED_BIN=sed +if [[ "$OSTYPE" == "darwin"* ]]; then + # Mac OSX, use gsed + SED_BIN=gsed +fi + +# parameters +OPERATOR_OLD="v1\.1\.7" +OPERATOR_NEW="v1\.1\.8" +TIDB_OLD="v4\.0\.8" +TIDB_NEW="v4\.0\.9" + +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" + +find ./deploy -name "*\.yaml.example"| xargs $SED_BIN -i "s/$TIDB_OLD/$TIDB_NEW/g" +find ./examples -name "*\.yaml"| xargs $SED_BIN -i "s/$TIDB_OLD/$TIDB_NEW/g" +find ./deploy -name "*\.tf"| xargs $SED_BIN -i "s/$TIDB_OLD/$TIDB_NEW/g" +find ./charts -name "*\.yaml"| xargs $SED_BIN -i "s/$TIDB_OLD/$TIDB_NEW/g" +$SED_BIN -i "s/$TIDB_OLD/$TIDB_NEW/g" images/tidb-backup-manager/Dockerfile diff --git a/images/tidb-backup-manager/Dockerfile b/images/tidb-backup-manager/Dockerfile index 9010e66f2a..35913436f7 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.8 +ARG TOOLKIT_V40=v4.0.9 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 \