From 79ad44b07802dd39922c4dca04c13067f56ca026 Mon Sep 17 00:00:00 2001 From: Shiori Date: Fri, 2 Jul 2021 18:01:39 +0800 Subject: [PATCH] Bump operator to v1.1.13 and tidb components to v4.0.13 (#4056) --- 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 +- deploy/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 ++-- 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 | 14 +++++++------- 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-cluster.yaml | 2 +- examples/dm/dm-monitor.yaml | 4 ++-- 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 | 14 ++++++++++---- images/tidb-backup-manager/Dockerfile | 2 +- manifests/dm/master/dm-master.yaml | 2 +- manifests/dm/worker/base/dm-worker.yaml | 2 +- 57 files changed, 85 insertions(+), 79 deletions(-) diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml index 45e227098c..7409509b82 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.12 + image: pingcap/tidb-operator:v1.1.13 imagePullPolicy: IfNotPresent resources: limits: @@ -108,7 +108,7 @@ pd: # annotations: {} "" # portName: "client" replicas: 3 - image: pingcap/pd:v4.0.12 + image: pingcap/pd:v4.0.13 # 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.12 + image: pingcap/tikv:v4.0.13 # 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.12 + image: pingcap/tidb:v4.0.13 # Image pull policy. imagePullPolicy: IfNotPresent @@ -506,7 +506,7 @@ monitor: storageClassName: local-storage storage: 10Gi initializer: - image: pingcap/tidb-monitor-initializer:v4.0.12 + image: pingcap/tidb-monitor-initializer:v4.0.13 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.12 + image: pingcap/tidb-binlog:v4.0.13 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.12 + image: pingcap/tidb-binlog:v4.0.13 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.12 + image: pingcap/tidb-lightning:v4.0.13 imagePullPolicy: IfNotPresent storageClassName: local-storage storage: 200Gi diff --git a/charts/tidb-drainer/values.yaml b/charts/tidb-drainer/values.yaml index 388fe23ed9..a18e8b0d5b 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.12 +clusterVersion: v4.0.13 baseImage: pingcap/tidb-binlog imagePullPolicy: IfNotPresent diff --git a/charts/tidb-lightning/values.yaml b/charts/tidb-lightning/values.yaml index 9e1197527a..e6472934f1 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.12 +image: pingcap/tidb-lightning:v4.0.13 imagePullPolicy: IfNotPresent # imagePullSecrets: [] diff --git a/charts/tidb-operator/values.yaml b/charts/tidb-operator/values.yaml index d2a77bb674..22d097ac84 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.12 +operatorImage: pingcap/tidb-operator:v1.1.13 imagePullPolicy: IfNotPresent # imagePullSecrets: [] # tidbBackupManagerImage is tidb backup manager image -tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.1.12 +tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.1.13 # # Enable or disable tidb-operator features: diff --git a/charts/tikv-importer/values.yaml b/charts/tikv-importer/values.yaml index 6ab872be5c..29a74a3faf 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.12 +image: pingcap/tidb-lightning:v4.0.13 imagePullPolicy: IfNotPresent # imagePullSecrets: [] diff --git a/deploy/aliyun/manifests/db-monitor.yaml.example b/deploy/aliyun/manifests/db-monitor.yaml.example index a17f606242..8fc5df6f5b 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.12 + version: v4.0.13 kubePrometheusURL: "" nodeSelector: {} persistent: true diff --git a/deploy/aliyun/manifests/db.yaml.example b/deploy/aliyun/manifests/db.yaml.example index 200218f26a..baefde3c5a 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.12 + version: v4.0.13 diff --git a/deploy/aliyun/variables.tf b/deploy/aliyun/variables.tf index 109d0385cc..e56e00cb06 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.12" + default = "v1.1.13" } variable "operator_helm_values" { @@ -36,7 +36,7 @@ variable "cluster_name" { variable "tidb_version" { description = "TiDB cluster version" - default = "v4.0.12" + default = "v4.0.13" } 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 e3c0e7d49c..43687d5628 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.12 + version: v4.0.13 kubePrometheusURL: "" nodeSelector: {} persistent: true diff --git a/deploy/aws/manifests/db.yaml.example b/deploy/aws/manifests/db.yaml.example index 639d196716..ae06aeb4d9 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.12 + version: v4.0.13 diff --git a/deploy/aws/variables.tf b/deploy/aws/variables.tf index cd8cb0181d..0daebedcaf 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.12" + default = "v1.1.13" } variable "operator_values" { @@ -80,7 +80,7 @@ variable "bastion_instance_type" { # For aws tutorials compatiablity variable "default_cluster_version" { - default = "v4.0.12" + default = "v4.0.13" } variable "default_cluster_pd_count" { diff --git a/deploy/gcp/manifests/db-monitor.yaml.example b/deploy/gcp/manifests/db-monitor.yaml.example index d40b0f7684..e0ff85baf3 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.12 + version: v4.0.13 kubePrometheusURL: "" nodeSelector: {} persistent: true diff --git a/deploy/gcp/manifests/db.yaml.example b/deploy/gcp/manifests/db.yaml.example index c92c865979..2722457c0c 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Retain schedulerName: tidb-scheduler diff --git a/deploy/gcp/variables.tf b/deploy/gcp/variables.tf index 106888fb0d..3bd1393efd 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.12" + default = "v4.0.13" } variable "tidb_operator_version" { - default = "v1.1.12" + default = "v1.1.13" } variable "tidb_operator_chart_version" { diff --git a/deploy/modules/aliyun/tidb-cluster/variables.tf b/deploy/modules/aliyun/tidb-cluster/variables.tf index 4f28c1900c..82c46cafb0 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.12" + default = "v4.0.13" } variable "tidb_cluster_chart_version" { diff --git a/deploy/modules/aws/tidb-cluster/variables.tf b/deploy/modules/aws/tidb-cluster/variables.tf index 3b74f19d8c..306ae2d9a8 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.12" + default = "v4.0.13" } variable "ssh_key_name" { diff --git a/deploy/modules/gcp/tidb-cluster/variables.tf b/deploy/modules/gcp/tidb-cluster/variables.tf index a950db1621..b18650d219 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.12" + default = "v4.0.13" } 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 416e7bb0b9..a14b36942f 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.12" + default = "v4.0.13" } variable "pd_count" { diff --git a/examples/advanced-statefulset/tidb-cluster-scaled.yaml b/examples/advanced-statefulset/tidb-cluster-scaled.yaml index a7baeaeacc..d4f3e06dfe 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/advanced-statefulset/tidb-cluster.yaml b/examples/advanced-statefulset/tidb-cluster.yaml index 31749ecf67..f6790e6df0 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/advanced/tidb-cluster.yaml b/examples/advanced/tidb-cluster.yaml index 43ea56b30f..abf0e4a0ad 100644 --- a/examples/advanced/tidb-cluster.yaml +++ b/examples/advanced/tidb-cluster.yaml @@ -10,7 +10,7 @@ spec: ####################### ## TiDB cluster version - version: "v4.0.12" + version: "v4.0.13" ## 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.12" + # version: "v4.0.13" # imagePullPolicy: IfNotPresent # imagePullSecrets: secretName # hostNetwork: false @@ -364,7 +364,7 @@ spec: ############################### ## The following block overwrites TiDB cluster-level configurations in `spec` - # version: "v4.0.12" + # version: "v4.0.13" # imagePullPolicy: IfNotPresent # imagePullSecrets: secretName # hostNetwork: false @@ -564,7 +564,7 @@ spec: ############################### ## The following block overwrites TiDB cluster-level configurations in `spec` - # version: "v4.0.12" + # version: "v4.0.13" # imagePullPolicy: IfNotPresent # imagePullSecrets: secretName # hostNetwork: false @@ -725,7 +725,7 @@ spec: ## Ref: https://pingcap.com/docs/tidb-in-kubernetes/stable/deploy-tidb-binlog/#deploy-pump # pump: # baseImage: pingcap/tidb-binlog - # version: "v4.0.12" + # version: "v4.0.13" # replicas: 1 # storageClassName: local-storage # requests: @@ -762,7 +762,7 @@ spec: ## Ref: https://pingcap.com/docs/tidb-in-kubernetes/stable/deploy-ticdc/ # ticdc: # baseImage: pingcap/ticdc - # version: "v4.0.12" + # version: "v4.0.13" # replicas: 3 # storageClassName: local-storage # requests: @@ -804,7 +804,7 @@ spec: # # Basic TiFlash Configuration # # ############################### # baseImage: pingcap/tiflash - # version: "v4.0.12" + # version: "v4.0.13" # replicas: 1 # # limits: # # cpu: 2000m diff --git a/examples/auto-scale/tidb-cluster.yaml b/examples/auto-scale/tidb-cluster.yaml index 35b70550e1..667f9a40f1 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/auto-scale/tidb-monitor.yaml b/examples/auto-scale/tidb-monitor.yaml index 674a57e1aa..d038b56748 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.12 + version: v4.0.13 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 7b3b124cdb..c96438e702 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.12 + version: v4.0.13 timezone: UTC configUpdateStrategy: RollingUpdate pvReclaimPolicy: Retain diff --git a/examples/aws/tidb-monitor.yaml b/examples/aws/tidb-monitor.yaml index ae12e4300f..ece5526f0f 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.12 + version: v4.0.13 kubePrometheusURL: "" persistent: true prometheus: diff --git a/examples/basic-cn/tidb-cluster.yaml b/examples/basic-cn/tidb-cluster.yaml index ec8eebc364..719858e797 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/basic-cn/tidb-monitor.yaml b/examples/basic-cn/tidb-monitor.yaml index 7f67094a8b..1a26cb94f7 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.12 + version: v4.0.13 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 024db4dd0c..a394915be6 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Delete enableDynamicConfiguration: true diff --git a/examples/basic-tls/tidb-monitor.yaml b/examples/basic-tls/tidb-monitor.yaml index 084a3132f6..805d2da1d2 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.12 + version: v4.0.13 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 3c4acdc2f6..034e6a4670 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/basic/tidb-monitor.yaml b/examples/basic/tidb-monitor.yaml index 9071924df4..defcd5e04a 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.12 + version: v4.0.13 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/dm/dm-cluster.yaml b/examples/dm/dm-cluster.yaml index 2d39986a49..f68a154b5f 100644 --- a/examples/dm/dm-cluster.yaml +++ b/examples/dm/dm-cluster.yaml @@ -4,7 +4,7 @@ metadata: name: basic namespace: demo spec: - version: v2.0.0-beta.2 + version: v2.0.4 pvReclaimPolicy: Retain discovery: address: "http://basic-discovery.demo:10261" diff --git a/examples/dm/dm-monitor.yaml b/examples/dm/dm-monitor.yaml index 1200679c0c..e77a0755a4 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.12 + version: v4.0.13 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 @@ -22,5 +22,5 @@ spec: - name: basic initializer: baseImage: pingcap/dm-monitor-initializer - version: v2.0.0 + version: v2.0.4 imagePullPolicy: IfNotPresent diff --git a/examples/gcp/tidb-cluster.yaml b/examples/gcp/tidb-cluster.yaml index 460e935520..45a90b8fd8 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.12 + version: v4.0.13 timezone: UTC configUpdateStrategy: RollingUpdate pvReclaimPolicy: Retain diff --git a/examples/gcp/tidb-monitor.yaml b/examples/gcp/tidb-monitor.yaml index ae12e4300f..ece5526f0f 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.12 + version: v4.0.13 kubePrometheusURL: "" persistent: true prometheus: diff --git a/examples/heterogeneous-tls/heterogeneous-cluster.yaml b/examples/heterogeneous-tls/heterogeneous-cluster.yaml index 13441a19f2..1eaf7196d4 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Retain discovery: {} @@ -38,7 +38,7 @@ spec: enabled: true tiflash: baseImage: pingcap/tiflash - version: v4.0.12 + version: v4.0.13 maxFailoverCount: 1 replicas: 1 storageClaims: diff --git a/examples/heterogeneous-tls/tidb-cluster.yaml b/examples/heterogeneous-tls/tidb-cluster.yaml index 2433b62bbe..a625920f59 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous-tls/tidb-monitor.yaml b/examples/heterogeneous-tls/tidb-monitor.yaml index ee6afb8745..a12ea2f0bd 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.12 + version: v4.0.13 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 db5912c96a..06d01ec379 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous/tidb-cluster.yaml b/examples/heterogeneous/tidb-cluster.yaml index ec73a8c860..4a9ed04015 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous/tidb-monitor.yaml b/examples/heterogeneous/tidb-monitor.yaml index afddc40268..f3233763a5 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.12 + version: v4.0.13 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 b634e086f2..9c6b64e53d 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.12 + version: v4.0.13 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 30a9a9ef31..ea951833e2 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.12 + version: v4.0.13 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 e3c3a12e1e..61dbee9cda 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.12 + version: v4.0.13 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 735997249b..a1ceeffb91 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.12 + version: v4.0.13 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 b3560f323b..33cd2cd037 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.12 + version: v4.0.13 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 273e515a13..18a34f6292 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.12 + version: v4.0.13 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 d47bb7931d..43e345180c 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/examples/multi-cluster/tidb-cluster-2.yaml b/examples/multi-cluster/tidb-cluster-2.yaml index cef20205d1..860707a7f2 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/examples/multiple-pv-tikv/tidb-cluster.yaml b/examples/multiple-pv-tikv/tidb-cluster.yaml index f22988b941..f886c2720f 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/examples/selfsigned-tls/tidb-cluster.yaml b/examples/selfsigned-tls/tidb-cluster.yaml index 0fd8a132a5..b01894581d 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.12 + version: v4.0.13 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/tiflash/tidb-cluster.yaml b/examples/tiflash/tidb-cluster.yaml index 5db8f397d9..d2b850321a 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.12 + version: v4.0.13 diff --git a/examples/tiflash/tidb-monitor.yaml b/examples/tiflash/tidb-monitor.yaml index 73a741ce85..ac6d0c7bd3 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.12 + version: v4.0.13 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/hack/bump-version.sh b/hack/bump-version.sh index 5fe5f5c8a1..b50d57f439 100755 --- a/hack/bump-version.sh +++ b/hack/bump-version.sh @@ -22,10 +22,12 @@ if [[ "$OSTYPE" == "darwin"* ]]; then fi # parameters -OPERATOR_OLD="v1\.1\.11" -OPERATOR_NEW="v1\.1\.12" -TIDB_OLD="v4\.0\.10" -TIDB_NEW="v4\.0\.12" +OPERATOR_OLD="v1\.1\.12" +OPERATOR_NEW="v1\.1\.13" +TIDB_OLD="v4\.0\.12" +TIDB_NEW="v4\.0\.13" +DM_OLD="v2.0.0" +DM_NEW="v2.0.4" 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" @@ -35,3 +37,7 @@ 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 + +find ./examples -name "*\.yaml"| xargs $SED_BIN -i "s/$DM_OLD/$DM_NEW/g" +find ./manifests -name "*\.yaml"| xargs $SED_BIN -i "s/$DM_OLD/$DM_NEW/g" + diff --git a/images/tidb-backup-manager/Dockerfile b/images/tidb-backup-manager/Dockerfile index f72e39ae47..6a9022749e 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.12 +ARG TOOLKIT_V40=v4.0.13 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 \ diff --git a/manifests/dm/master/dm-master.yaml b/manifests/dm/master/dm-master.yaml index bad70ca5a9..ea97dff348 100644 --- a/manifests/dm/master/dm-master.yaml +++ b/manifests/dm/master/dm-master.yaml @@ -51,7 +51,7 @@ spec: value: dm-master - name: TZ value: UTC - image: pingcap/dm:v2.0.0-beta.1 + image: pingcap/dm:v2.0.4 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 8 diff --git a/manifests/dm/worker/base/dm-worker.yaml b/manifests/dm/worker/base/dm-worker.yaml index 42103a9631..a36590c65d 100644 --- a/manifests/dm/worker/base/dm-worker.yaml +++ b/manifests/dm/worker/base/dm-worker.yaml @@ -47,7 +47,7 @@ spec: value: dm-worker - name: TZ value: UTC - image: pingcap/dm:v2.0.0-beta.1 + image: pingcap/dm:v2.0.4 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 8