From 486cc85c8380efc4f36b3125a1abba9e3146a2c8 Mon Sep 17 00:00:00 2001 From: Xuecheng Zhang Date: Sat, 25 May 2024 00:10:23 +0800 Subject: [PATCH] bump TiDB Operator to 1.6.0 and TiDB to 8.1.0 (#5641) --- charts/br-federation/values.yaml | 2 +- charts/tidb-drainer/values.yaml | 2 +- charts/tidb-lightning/values.yaml | 2 +- charts/tidb-operator/values.yaml | 17 ++++++-------- cmd/http-service/go.mod | 4 ++-- .../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 | 14 ++++++------ examples/advanced/tidb-monitor.yaml | 2 +- examples/aks/tidb-cluster.yaml | 2 +- examples/aks/tidb-monitor.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 +- .../basic-random-password/tidb-cluster.yaml | 2 +- .../basic-storagevolumes/tidb-cluster.yaml | 2 +- .../basic-storagevolumes/tidb-monitor.yaml | 2 +- examples/basic-tls/tidb-cluster.yaml | 2 +- examples/basic-tls/tidb-monitor.yaml | 2 +- examples/basic/pd-micro-service-cluster.yaml | 21 ++++++++---------- 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-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 +- examples/istio/tidb-cluster.yaml | 2 +- examples/istio/tidb-monitor.yaml | 2 +- .../ns1-cluster.yaml | 2 +- .../ns2-cluster.yaml | 2 +- .../tidb-monitor.yaml | 2 +- .../ns1-cluster.yaml | 2 +- .../ns2-cluster.yaml | 2 +- .../tidb-monitor.yaml | 2 +- .../ns1-cluster.yaml | 2 +- .../ns2-cluster.yaml | 2 +- .../tidb-monitor.yaml | 2 +- .../tidb-cluster.yaml | 2 +- .../tidb-monitor.yaml | 2 +- examples/monitor-shards/tidb-cluster.yaml | 2 +- examples/monitor-shards/tidb-monitor.yaml | 2 +- .../grafana/tidb-monitor.yaml | 2 +- .../prometheus/tidb-monitor.yaml | 2 +- .../tidb-monitor.yaml | 2 +- .../tidb-monitor-with-additional-volumes.yaml | 2 +- .../monitor-with-thanos/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/namespaced/tidb-cluster.yaml | 2 +- examples/namespaced/tidb-monitor.yaml | 2 +- examples/podpatch/tidb-cluster.yaml | 2 +- examples/podpatch/tidb-monitor.yaml | 2 +- .../prometheus-operator/tidb-cluster.yaml | 2 +- examples/readiness/tidb-cluster.yaml | 2 +- examples/selfsigned-tls/tidb-cluster.yaml | 2 +- examples/tiflash/tidb-cluster.yaml | 2 +- examples/tiflash/tidb-monitor.yaml | 2 +- examples/tngm/tidb-cluster.yaml | 2 +- go.mod | 4 ++-- hack/bump-version.sh | 12 +++++----- images/tidb-backup-manager/Dockerfile | 2 +- pkg/client/go.mod | 2 +- tests/e2e/util/image/image.go | 3 +-- tests/pkg/fixture/fixture.go | 22 +++++-------------- 88 files changed, 124 insertions(+), 143 deletions(-) diff --git a/charts/br-federation/values.yaml b/charts/br-federation/values.yaml index ae1217ffd37..8666f59e023 100644 --- a/charts/br-federation/values.yaml +++ b/charts/br-federation/values.yaml @@ -10,7 +10,7 @@ rbac: # timezone is the default system timzone timezone: UTC -image: pingcap/br-federation-manager:v1.6.0-beta.1 +image: pingcap/br-federation-manager:v1.6.0 imagePullPolicy: IfNotPresent # imagePullSecrets: [] diff --git a/charts/tidb-drainer/values.yaml b/charts/tidb-drainer/values.yaml index f12d320f4f3..a57eec5fb7f 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: v7.5.1 +clusterVersion: v8.1.0 baseImage: pingcap/tidb-binlog imagePullPolicy: IfNotPresent diff --git a/charts/tidb-lightning/values.yaml b/charts/tidb-lightning/values.yaml index 0955797a70e..53e2b58c9b1 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:v7.5.1 +image: pingcap/tidb-lightning:v8.1.0 imagePullPolicy: IfNotPresent # imagePullSecrets: [] diff --git a/charts/tidb-operator/values.yaml b/charts/tidb-operator/values.yaml index 8578e2376d0..3c7ca825f32 100644 --- a/charts/tidb-operator/values.yaml +++ b/charts/tidb-operator/values.yaml @@ -12,29 +12,27 @@ rbac: timezone: UTC # operatorImage is TiDB Operator image -operatorImage: pingcap/tidb-operator:v1.6.0-beta.1 +operatorImage: pingcap/tidb-operator:v1.6.0 imagePullPolicy: IfNotPresent # imagePullSecrets: [] # tidbBackupManagerImage is tidb backup manager image -tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.6.0-beta.1 +tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.6.0 # # Enable or disable tidb-operator features: # -# StableScheduling (default: true) -# Enable stable scheduling of tidb servers. -# # AdvancedStatefulSet (default: false) # If enabled, tidb-operator will use AdvancedStatefulSet to manage pods # instead of Kubernetes StatefulSet. # It's ok to turn it on if this feature is not enabled. However it's not ok # to turn it off when the tidb-operator already uses AdvancedStatefulSet to -# manage pods. This is in alpha phase. +# manage pods. This is in GA phase. +# Ref: https://docs.pingcap.com/tidb-in-kubernetes/stable/advanced-statefulset # # VolumeModifying (default false) # If enabled, tidb-operator support to increase the size or performance of volumes -# for specific volume provisioner. +# for specific volume provisioner. This is in GA phase for AWS EBS. # # VolumeReplacing (default false) # If enabled, tidb-operator support generic volume changes (size, storageclass & number of volumes) @@ -42,12 +40,11 @@ tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.6.0-beta.1 # pd, tikv, tidb supported. If enabled, takes precedence over volume resizing & modifying. # This works by deleting pod+volumes one at a time (similar to scale-in), and recreating it. # For PD & TiKV this will first create one new spare replica to take the load before deleting existing ones -# Safely deleting a volume and replacing them can take a long time (Especially TiKV to move regions) +# Safely deleting a volume and replacing them can take a long time (Especially TiKV to move regions). +# This is in Alpha phase. # features: [] # - AdvancedStatefulSet=false -# - StableScheduling=true -# - AutoScaling=false # - VolumeModifying=false # - VolumeReplacing=false diff --git a/cmd/http-service/go.mod b/cmd/http-service/go.mod index 1d70f87158c..beba6ad46f7 100644 --- a/cmd/http-service/go.mod +++ b/cmd/http-service/go.mod @@ -6,8 +6,8 @@ require ( github.com/gin-gonic/gin v1.9.1 github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 github.com/pingcap/log v1.1.1-0.20230317032135-a0d097d16e22 - github.com/pingcap/tidb-operator/pkg/apis v1.6.0-beta.1 - github.com/pingcap/tidb-operator/pkg/client v0.0.0-00010101000000-000000000000 + github.com/pingcap/tidb-operator/pkg/apis v1.6.0 + github.com/pingcap/tidb-operator/pkg/client v1.6.0 go.uber.org/zap v1.23.0 google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 google.golang.org/grpc v1.59.0 diff --git a/deploy/aliyun/manifests/db-monitor.yaml.example b/deploy/aliyun/manifests/db-monitor.yaml.example index 2fef7052563..fd54a3ac169 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: v7.5.1 + version: v8.1.0 kubePrometheusURL: "" nodeSelector: {} persistent: true diff --git a/deploy/aliyun/manifests/db.yaml.example b/deploy/aliyun/manifests/db.yaml.example index 2b8ee240c06..34514898fc3 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: v7.5.1 + version: v8.1.0 diff --git a/deploy/aliyun/variables.tf b/deploy/aliyun/variables.tf index 8066c0cd427..a3affbbf54e 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.6.0-beta.1" + default = "v1.6.0" } variable "operator_helm_values" { @@ -36,7 +36,7 @@ variable "cluster_name" { variable "tidb_version" { description = "TiDB cluster version" - default = "v7.5.1" + default = "v8.1.0" } 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 22fb02707bb..ba6a2bcfbbf 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: v7.5.1 + version: v8.1.0 kubePrometheusURL: "" nodeSelector: {} persistent: true diff --git a/deploy/aws/manifests/db.yaml.example b/deploy/aws/manifests/db.yaml.example index 96e92641d9a..fb5146d65de 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: v7.5.1 + version: v8.1.0 diff --git a/deploy/aws/variables.tf b/deploy/aws/variables.tf index 56b46046128..5bef21469b3 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.6.0-beta.1" + default = "v1.6.0" } variable "operator_values" { @@ -80,7 +80,7 @@ variable "bastion_instance_type" { # For aws tutorials compatiablity variable "default_cluster_version" { - default = "v7.5.1" + default = "v8.1.0" } variable "default_cluster_pd_count" { diff --git a/deploy/gcp/manifests/db-monitor.yaml.example b/deploy/gcp/manifests/db-monitor.yaml.example index d829fb2f688..a9763f6cffd 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: v7.5.1 + version: v8.1.0 kubePrometheusURL: "" nodeSelector: {} persistent: true diff --git a/deploy/gcp/manifests/db.yaml.example b/deploy/gcp/manifests/db.yaml.example index f0014636900..2c63e3159b0 100644 --- a/deploy/gcp/manifests/db.yaml.example +++ b/deploy/gcp/manifests/db.yaml.example @@ -5,7 +5,7 @@ metadata: spec: helper: image: busybox:1.34.1 - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain schedulerName: tidb-scheduler diff --git a/deploy/gcp/variables.tf b/deploy/gcp/variables.tf index e67fcc20f00..75b59ab0099 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 = "v7.5.1" + default = "v8.1.0" } variable "tidb_operator_version" { - default = "v1.6.0-beta.1" + default = "v1.6.0" } variable "tidb_operator_chart_version" { diff --git a/deploy/modules/aliyun/tidb-cluster/variables.tf b/deploy/modules/aliyun/tidb-cluster/variables.tf index aa63f1e9ecb..80fd5fa5064 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 = "v7.5.1" + default = "v8.1.0" } variable "tidb_cluster_chart_version" { diff --git a/deploy/modules/aws/tidb-cluster/variables.tf b/deploy/modules/aws/tidb-cluster/variables.tf index 3f9b550583d..4fc39eddff5 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 = "v7.5.1" + default = "v8.1.0" } variable "ssh_key_name" { diff --git a/deploy/modules/gcp/tidb-cluster/variables.tf b/deploy/modules/gcp/tidb-cluster/variables.tf index 411cee4722e..462a9482ba5 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 = "v7.5.1" + default = "v8.1.0" } 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 70cd969f004..abf11e81536 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 = "v7.5.1" + default = "v8.1.0" } variable "pd_count" { diff --git a/examples/advanced-statefulset/tidb-cluster-scaled.yaml b/examples/advanced-statefulset/tidb-cluster-scaled.yaml index 219ba9bf388..09961d818bc 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: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/advanced-statefulset/tidb-cluster.yaml b/examples/advanced-statefulset/tidb-cluster.yaml index 64cd08aeebb..cdcd37f1528 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: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/advanced/tidb-cluster.yaml b/examples/advanced/tidb-cluster.yaml index 4cbe31af024..618ccd9cffd 100644 --- a/examples/advanced/tidb-cluster.yaml +++ b/examples/advanced/tidb-cluster.yaml @@ -10,7 +10,7 @@ spec: ####################### ## TiDB cluster version - version: "v7.5.1" + version: "v8.1.0" ## Time zone of TiDB cluster Pods timezone: UTC @@ -218,7 +218,7 @@ spec: ############################# ## The following block overwrites TiDB cluster-level configurations in `spec` - # version: "v7.5.1" + # version: "v8.1.0" # imagePullPolicy: IfNotPresent # imagePullSecrets: # - name: secretName @@ -408,7 +408,7 @@ spec: ############################### ## The following block overwrites TiDB cluster-level configurations in `spec` - # version: "v7.5.1" + # version: "v8.1.0" # imagePullPolicy: IfNotPresent # imagePullSecrets: # - name: secretName @@ -619,7 +619,7 @@ spec: ############################### ## The following block overwrites TiDB cluster-level configurations in `spec` - # version: "v7.5.1" + # version: "v8.1.0" # imagePullPolicy: IfNotPresent # imagePullSecrets: # - name: secretName @@ -803,7 +803,7 @@ spec: ## Ref: https://docs.pingcap.com/tidb-in-kubernetes/stable/deploy-tidb-binlog/#deploy-pump # pump: # baseImage: pingcap/tidb-binlog - # version: "v7.5.1" + # version: "v8.1.0" # replicas: 1 # storageClassName: local-storage # requests: @@ -848,7 +848,7 @@ spec: ## Ref: https://docs.pingcap.com/tidb-in-kubernetes/stable/deploy-ticdc/ # ticdc: # baseImage: pingcap/ticdc - # version: "v7.5.1" + # version: "v8.1.0" # replicas: 3 # storageClassName: local-storage # requests: @@ -897,7 +897,7 @@ spec: # # Basic TiFlash Configuration # # ############################### # baseImage: pingcap/tiflash - # version: "v7.5.1" + # version: "v8.1.0" # replicas: 1 # # limits: # # cpu: 2000m diff --git a/examples/advanced/tidb-monitor.yaml b/examples/advanced/tidb-monitor.yaml index f86d0843e0f..83368998e9c 100644 --- a/examples/advanced/tidb-monitor.yaml +++ b/examples/advanced/tidb-monitor.yaml @@ -377,7 +377,7 @@ spec: ## ImagePullPolicy of initializer. # imagePullPolicy: IfNotPresent ## Initializer version. - version: v7.5.1 + version: v8.1.0 ## Describes the compute resource requirements and limits of initializer. ## Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ diff --git a/examples/aks/tidb-cluster.yaml b/examples/aks/tidb-cluster.yaml index d60b9cbda6e..652d7224de9 100644 --- a/examples/aks/tidb-cluster.yaml +++ b/examples/aks/tidb-cluster.yaml @@ -3,7 +3,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC configUpdateStrategy: RollingUpdate pvReclaimPolicy: Retain diff --git a/examples/aks/tidb-monitor.yaml b/examples/aks/tidb-monitor.yaml index c3c2cce1727..00b0e01426b 100644 --- a/examples/aks/tidb-monitor.yaml +++ b/examples/aks/tidb-monitor.yaml @@ -29,7 +29,7 @@ spec: initializer: baseImage: pingcap/tidb-monitor-initializer imagePullPolicy: IfNotPresent - version: v7.5.1 + version: v8.1.0 kubePrometheusURL: "" persistent: true prometheus: diff --git a/examples/auto-scale/tidb-cluster.yaml b/examples/auto-scale/tidb-cluster.yaml index 3d0445c5ce4..325d10ad432 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: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/auto-scale/tidb-monitor.yaml b/examples/auto-scale/tidb-monitor.yaml index 99b8eec219a..521932f2a49 100644 --- a/examples/auto-scale/tidb-monitor.yaml +++ b/examples/auto-scale/tidb-monitor.yaml @@ -13,7 +13,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 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 f42dc98ae01..70f5481c299 100644 --- a/examples/aws/tidb-cluster.yaml +++ b/examples/aws/tidb-cluster.yaml @@ -3,7 +3,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC configUpdateStrategy: RollingUpdate pvReclaimPolicy: Retain diff --git a/examples/aws/tidb-monitor.yaml b/examples/aws/tidb-monitor.yaml index dfa42bb9b5c..b0359db7aa9 100644 --- a/examples/aws/tidb-monitor.yaml +++ b/examples/aws/tidb-monitor.yaml @@ -32,7 +32,7 @@ spec: initializer: baseImage: pingcap/tidb-monitor-initializer imagePullPolicy: IfNotPresent - version: v7.5.1 + version: v8.1.0 kubePrometheusURL: "" persistent: true prometheus: diff --git a/examples/basic-cn/tidb-cluster.yaml b/examples/basic-cn/tidb-cluster.yaml index 89152da0abb..4109fd4bb48 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: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/basic-cn/tidb-monitor.yaml b/examples/basic-cn/tidb-monitor.yaml index 5470698ffcf..05353bf3b2d 100644 --- a/examples/basic-cn/tidb-monitor.yaml +++ b/examples/basic-cn/tidb-monitor.yaml @@ -13,7 +13,7 @@ spec: version: 7.5.11 initializer: baseImage: uhub.service.ucloud.cn/pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: uhub.service.ucloud.cn/pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/basic-random-password/tidb-cluster.yaml b/examples/basic-random-password/tidb-cluster.yaml index 0c073a15320..0a38ea20147 100644 --- a/examples/basic-random-password/tidb-cluster.yaml +++ b/examples/basic-random-password/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/basic-storagevolumes/tidb-cluster.yaml b/examples/basic-storagevolumes/tidb-cluster.yaml index 838848be1d8..59e3bae3c0e 100644 --- a/examples/basic-storagevolumes/tidb-cluster.yaml +++ b/examples/basic-storagevolumes/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/basic-storagevolumes/tidb-monitor.yaml b/examples/basic-storagevolumes/tidb-monitor.yaml index 5470698ffcf..05353bf3b2d 100644 --- a/examples/basic-storagevolumes/tidb-monitor.yaml +++ b/examples/basic-storagevolumes/tidb-monitor.yaml @@ -13,7 +13,7 @@ spec: version: 7.5.11 initializer: baseImage: uhub.service.ucloud.cn/pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: uhub.service.ucloud.cn/pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/basic-tls/tidb-cluster.yaml b/examples/basic-tls/tidb-cluster.yaml index 4f8a7a3585f..c10b433d937 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: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Delete enableDynamicConfiguration: true diff --git a/examples/basic-tls/tidb-monitor.yaml b/examples/basic-tls/tidb-monitor.yaml index 5f2b4390e74..2329ee43463 100644 --- a/examples/basic-tls/tidb-monitor.yaml +++ b/examples/basic-tls/tidb-monitor.yaml @@ -13,7 +13,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/basic/pd-micro-service-cluster.yaml b/examples/basic/pd-micro-service-cluster.yaml index f0e9e1075a9..355831f56ea 100644 --- a/examples/basic/pd-micro-service-cluster.yaml +++ b/examples/basic/pd-micro-service-cluster.yaml @@ -7,7 +7,7 @@ metadata: name: basic namespace: pingcap spec: - version: v7.5.0 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true @@ -16,9 +16,8 @@ spec: helper: image: alpine:3.16.0 pd: - # TODO: use a stable version - baseImage: hub.pingcap.net/devbuild/pd - version: v8.0.0-4193 + baseImage: pingcap/pd + version: v8.1.0 maxFailoverCount: 0 replicas: 1 # if storageClassName is not set, the default Storage Class of the Kubernetes cluster will be used @@ -29,18 +28,16 @@ spec: mode: "ms" pdms: - name: "tso" - # TODO: use a stable version - baseImage: hub.pingcap.net/devbuild/pd - version: v8.0.0-4193 + baseImage: pingcap/pd + version: v8.1.0 replicas: 2 - name: "scheduling" - # TODO: use a stable version - baseImage: hub.pingcap.net/devbuild/pd - version: v8.0.0-4193 + baseImage: pingcap/pd + version: v8.1.0 replicas: 1 tikv: baseImage: pingcap/tikv - version: v7.5.0 + version: v8.1.0 maxFailoverCount: 0 # If only 1 TiKV is deployed, the TiKV region leader # cannot be transferred during upgrade, so we have @@ -63,7 +60,7 @@ spec: max-open-files: 256 tidb: baseImage: pingcap/tidb - version: v7.5.0 + version: v8.1.0 maxFailoverCount: 0 replicas: 1 service: diff --git a/examples/basic/tidb-cluster.yaml b/examples/basic/tidb-cluster.yaml index c9404f6b2fd..1aaf4123c07 100644 --- a/examples/basic/tidb-cluster.yaml +++ b/examples/basic/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/basic/tidb-monitor.yaml b/examples/basic/tidb-monitor.yaml index 0753affd5b3..9e1259d4e44 100644 --- a/examples/basic/tidb-monitor.yaml +++ b/examples/basic/tidb-monitor.yaml @@ -14,7 +14,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 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 bc43c017d73..a6ae717e6a9 100644 --- a/examples/dm/dm-cluster.yaml +++ b/examples/dm/dm-cluster.yaml @@ -3,7 +3,7 @@ kind: DMCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 pvReclaimPolicy: Retain discovery: {} master: diff --git a/examples/dm/dm-monitor.yaml b/examples/dm/dm-monitor.yaml index 37ad16c1aa2..26dd7e0a63f 100644 --- a/examples/dm/dm-monitor.yaml +++ b/examples/dm/dm-monitor.yaml @@ -11,7 +11,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 @@ -23,5 +23,5 @@ spec: - name: basic initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 imagePullPolicy: IfNotPresent diff --git a/examples/gcp/tidb-cluster.yaml b/examples/gcp/tidb-cluster.yaml index 7444b29fa06..f7338a5cf06 100644 --- a/examples/gcp/tidb-cluster.yaml +++ b/examples/gcp/tidb-cluster.yaml @@ -3,7 +3,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC configUpdateStrategy: RollingUpdate pvReclaimPolicy: Retain diff --git a/examples/gcp/tidb-monitor.yaml b/examples/gcp/tidb-monitor.yaml index 61958532caf..c693ad02cf7 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: v7.5.1 + version: v8.1.0 kubePrometheusURL: "" persistent: true prometheus: diff --git a/examples/heterogeneous-tls/heterogeneous-cluster.yaml b/examples/heterogeneous-tls/heterogeneous-cluster.yaml index b48c99a6109..52fdd7ae881 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: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain discovery: {} @@ -38,7 +38,7 @@ spec: tiflash: baseImage: pingcap/tiflash maxFailoverCount: 0 - version: v7.5.1 + version: v8.1.0 maxFailoverCount: 1 replicas: 1 storageClaims: diff --git a/examples/heterogeneous-tls/tidb-cluster.yaml b/examples/heterogeneous-tls/tidb-cluster.yaml index ae7cee31f26..95f8a619f9f 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: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous-tls/tidb-monitor.yaml b/examples/heterogeneous-tls/tidb-monitor.yaml index a5c726817a1..c9785c89371 100644 --- a/examples/heterogeneous-tls/tidb-monitor.yaml +++ b/examples/heterogeneous-tls/tidb-monitor.yaml @@ -14,7 +14,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 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 1702a7b34dd..98978caead9 100644 --- a/examples/heterogeneous/heterogeneous-cluster.yaml +++ b/examples/heterogeneous/heterogeneous-cluster.yaml @@ -7,7 +7,7 @@ metadata: name: basic-heterogeneous spec: configUpdateStrategy: RollingUpdate - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous/tidb-cluster.yaml b/examples/heterogeneous/tidb-cluster.yaml index c6a9a6db272..45c993ca74b 100644 --- a/examples/heterogeneous/tidb-cluster.yaml +++ b/examples/heterogeneous/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous/tidb-monitor.yaml b/examples/heterogeneous/tidb-monitor.yaml index 6a8853c0079..9360d47d41b 100644 --- a/examples/heterogeneous/tidb-monitor.yaml +++ b/examples/heterogeneous/tidb-monitor.yaml @@ -14,7 +14,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 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 954c61d1ebf..1592f361134 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: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/istio/tidb-cluster.yaml b/examples/istio/tidb-cluster.yaml index 59969fd6c88..ef8f6025562 100644 --- a/examples/istio/tidb-cluster.yaml +++ b/examples/istio/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/istio/tidb-monitor.yaml b/examples/istio/tidb-monitor.yaml index 0753affd5b3..9e1259d4e44 100644 --- a/examples/istio/tidb-monitor.yaml +++ b/examples/istio/tidb-monitor.yaml @@ -14,7 +14,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/monitor-dynamic-configmap/ns1-cluster.yaml b/examples/monitor-dynamic-configmap/ns1-cluster.yaml index b3b904a50dc..c3dd538955e 100644 --- a/examples/monitor-dynamic-configmap/ns1-cluster.yaml +++ b/examples/monitor-dynamic-configmap/ns1-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: ns1 spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/monitor-dynamic-configmap/ns2-cluster.yaml b/examples/monitor-dynamic-configmap/ns2-cluster.yaml index 7e2287c0367..2ee684276ed 100644 --- a/examples/monitor-dynamic-configmap/ns2-cluster.yaml +++ b/examples/monitor-dynamic-configmap/ns2-cluster.yaml @@ -7,7 +7,7 @@ metadata: name: ns2 namespace: ns2 spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/monitor-dynamic-configmap/tidb-monitor.yaml b/examples/monitor-dynamic-configmap/tidb-monitor.yaml index 3ba5129aa66..18f5cdf5c11 100644 --- a/examples/monitor-dynamic-configmap/tidb-monitor.yaml +++ b/examples/monitor-dynamic-configmap/tidb-monitor.yaml @@ -17,7 +17,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/monitor-multiple-cluster-non-tls/ns1-cluster.yaml b/examples/monitor-multiple-cluster-non-tls/ns1-cluster.yaml index 68d1e418fae..cd7e5be0751 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: v7.5.1 + version: v8.1.0 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 a9a10154ac0..f1796a6bfd5 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: v7.5.1 + version: v8.1.0 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 3ba5129aa66..18f5cdf5c11 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: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/monitor-multiple-cluster-tls/ns1-cluster.yaml b/examples/monitor-multiple-cluster-tls/ns1-cluster.yaml index 5285778017f..7cf161efcae 100644 --- a/examples/monitor-multiple-cluster-tls/ns1-cluster.yaml +++ b/examples/monitor-multiple-cluster-tls/ns1-cluster.yaml @@ -9,7 +9,7 @@ metadata: spec: tlsCluster: enabled: true - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/monitor-multiple-cluster-tls/ns2-cluster.yaml b/examples/monitor-multiple-cluster-tls/ns2-cluster.yaml index 5e2d77529f6..3d7e13c3f83 100644 --- a/examples/monitor-multiple-cluster-tls/ns2-cluster.yaml +++ b/examples/monitor-multiple-cluster-tls/ns2-cluster.yaml @@ -9,7 +9,7 @@ metadata: spec: tlsCluster: enabled: true - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/monitor-multiple-cluster-tls/tidb-monitor.yaml b/examples/monitor-multiple-cluster-tls/tidb-monitor.yaml index 3ba5129aa66..18f5cdf5c11 100644 --- a/examples/monitor-multiple-cluster-tls/tidb-monitor.yaml +++ b/examples/monitor-multiple-cluster-tls/tidb-monitor.yaml @@ -17,7 +17,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/monitor-prom-remotewrite/tidb-cluster.yaml b/examples/monitor-prom-remotewrite/tidb-cluster.yaml index 80ab69b158f..061c5dba8af 100644 --- a/examples/monitor-prom-remotewrite/tidb-cluster.yaml +++ b/examples/monitor-prom-remotewrite/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/monitor-prom-remotewrite/tidb-monitor.yaml b/examples/monitor-prom-remotewrite/tidb-monitor.yaml index 1d6ebf2ea71..5055544dd4b 100644 --- a/examples/monitor-prom-remotewrite/tidb-monitor.yaml +++ b/examples/monitor-prom-remotewrite/tidb-monitor.yaml @@ -20,7 +20,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/monitor-shards/tidb-cluster.yaml b/examples/monitor-shards/tidb-cluster.yaml index 80ab69b158f..061c5dba8af 100644 --- a/examples/monitor-shards/tidb-cluster.yaml +++ b/examples/monitor-shards/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/monitor-shards/tidb-monitor.yaml b/examples/monitor-shards/tidb-monitor.yaml index 3c1d5b55311..a1ac0df3cbf 100644 --- a/examples/monitor-shards/tidb-monitor.yaml +++ b/examples/monitor-shards/tidb-monitor.yaml @@ -12,7 +12,7 @@ spec: version: v2.27.1 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/monitor-with-externalConfigMap/grafana/tidb-monitor.yaml b/examples/monitor-with-externalConfigMap/grafana/tidb-monitor.yaml index 5a24bbfe624..197de2d42b2 100644 --- a/examples/monitor-with-externalConfigMap/grafana/tidb-monitor.yaml +++ b/examples/monitor-with-externalConfigMap/grafana/tidb-monitor.yaml @@ -16,7 +16,7 @@ spec: mountPath: /grafana-dashboard-definitions/tidb/dashboards/custom initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/monitor-with-externalConfigMap/prometheus/tidb-monitor.yaml b/examples/monitor-with-externalConfigMap/prometheus/tidb-monitor.yaml index 30eabb82006..7b85a86e84c 100644 --- a/examples/monitor-with-externalConfigMap/prometheus/tidb-monitor.yaml +++ b/examples/monitor-with-externalConfigMap/prometheus/tidb-monitor.yaml @@ -20,7 +20,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/monitor-with-externalRules/tidb-monitor.yaml b/examples/monitor-with-externalRules/tidb-monitor.yaml index a393bdc7190..fcf89b9bb9b 100644 --- a/examples/monitor-with-externalRules/tidb-monitor.yaml +++ b/examples/monitor-with-externalRules/tidb-monitor.yaml @@ -16,7 +16,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/monitor-with-thanos/tidb-monitor-with-additional-volumes.yaml b/examples/monitor-with-thanos/tidb-monitor-with-additional-volumes.yaml index 2741a16bc35..4b1194a043b 100644 --- a/examples/monitor-with-thanos/tidb-monitor-with-additional-volumes.yaml +++ b/examples/monitor-with-thanos/tidb-monitor-with-additional-volumes.yaml @@ -21,7 +21,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/monitor-with-thanos/tidb-monitor.yaml b/examples/monitor-with-thanos/tidb-monitor.yaml index ffcfef7b902..712823983b8 100644 --- a/examples/monitor-with-thanos/tidb-monitor.yaml +++ b/examples/monitor-with-thanos/tidb-monitor.yaml @@ -16,7 +16,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 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 e108d6a5573..4d5d48feb50 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: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/multi-cluster/tidb-cluster-2.yaml b/examples/multi-cluster/tidb-cluster-2.yaml index 07f0379d53d..92ee2dffe30 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: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/multiple-pv-tikv/tidb-cluster.yaml b/examples/multiple-pv-tikv/tidb-cluster.yaml index 605e6a569bb..a90ec86cfb2 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: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/examples/namespaced/tidb-cluster.yaml b/examples/namespaced/tidb-cluster.yaml index 80ab69b158f..061c5dba8af 100644 --- a/examples/namespaced/tidb-cluster.yaml +++ b/examples/namespaced/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/namespaced/tidb-monitor.yaml b/examples/namespaced/tidb-monitor.yaml index 06f2e3771ba..5feb3d770df 100644 --- a/examples/namespaced/tidb-monitor.yaml +++ b/examples/namespaced/tidb-monitor.yaml @@ -13,7 +13,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/podpatch/tidb-cluster.yaml b/examples/podpatch/tidb-cluster.yaml index ead2d11650c..f1d3ca1f059 100644 --- a/examples/podpatch/tidb-cluster.yaml +++ b/examples/podpatch/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/podpatch/tidb-monitor.yaml b/examples/podpatch/tidb-monitor.yaml index 7ded390e120..6410854ce7f 100644 --- a/examples/podpatch/tidb-monitor.yaml +++ b/examples/podpatch/tidb-monitor.yaml @@ -14,7 +14,7 @@ spec: version: 7.5.11 initializer: baseImage: pingcap/tidb-monitor-initializer - version: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/prometheus-operator/tidb-cluster.yaml b/examples/prometheus-operator/tidb-cluster.yaml index c9a95c998e8..3b156991ccb 100644 --- a/examples/prometheus-operator/tidb-cluster.yaml +++ b/examples/prometheus-operator/tidb-cluster.yaml @@ -3,7 +3,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/readiness/tidb-cluster.yaml b/examples/readiness/tidb-cluster.yaml index 333368441ca..be13a1583db 100644 --- a/examples/readiness/tidb-cluster.yaml +++ b/examples/readiness/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/selfsigned-tls/tidb-cluster.yaml b/examples/selfsigned-tls/tidb-cluster.yaml index 513a687fed5..60d63294611 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: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/tiflash/tidb-cluster.yaml b/examples/tiflash/tidb-cluster.yaml index 6cbd20760ff..f319167ebb0 100644 --- a/examples/tiflash/tidb-cluster.yaml +++ b/examples/tiflash/tidb-cluster.yaml @@ -62,4 +62,4 @@ spec: storage: 100Gi storageClassName: local-storage timezone: UTC - version: v7.5.1 + version: v8.1.0 diff --git a/examples/tiflash/tidb-monitor.yaml b/examples/tiflash/tidb-monitor.yaml index 831030f29ff..11bc5fb24b5 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: v7.5.1 + version: v8.1.0 reloader: baseImage: pingcap/tidb-monitor-reloader version: v1.0.1 diff --git a/examples/tngm/tidb-cluster.yaml b/examples/tngm/tidb-cluster.yaml index 59969fd6c88..ef8f6025562 100644 --- a/examples/tngm/tidb-cluster.yaml +++ b/examples/tngm/tidb-cluster.yaml @@ -6,7 +6,7 @@ kind: TidbCluster metadata: name: basic spec: - version: v7.5.1 + version: v8.1.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/go.mod b/go.mod index 097b3feb17d..03ac5765879 100644 --- a/go.mod +++ b/go.mod @@ -35,8 +35,8 @@ require ( github.com/pingcap/advanced-statefulset/client v1.17.1-0.20240110031508-90a78e33c3fd github.com/pingcap/errors v0.11.4 github.com/pingcap/kvproto v0.0.0-20231122054644-fb0f5c2a0a10 - github.com/pingcap/tidb-operator/pkg/apis v1.6.0-beta.1 - github.com/pingcap/tidb-operator/pkg/client v1.6.0-beta.1 + github.com/pingcap/tidb-operator/pkg/apis v1.6.0 + github.com/pingcap/tidb-operator/pkg/client v1.6.0 github.com/pingcap/tiproxy/lib v0.0.0-20230907130944-eb5b4b9c9e79 github.com/prometheus/client_golang v1.17.0 github.com/prometheus/client_model v0.5.0 diff --git a/hack/bump-version.sh b/hack/bump-version.sh index 28900f82426..073474917eb 100755 --- a/hack/bump-version.sh +++ b/hack/bump-version.sh @@ -22,12 +22,12 @@ if [[ "$OSTYPE" == "darwin"* ]]; then fi # parameters -OPERATOR_OLD="v1\.6\.0-alpha.10" -OPERATOR_NEW="v1\.6\.0-beta.1" -TIDB_OLD="v7\.1\.1" -TIDB_NEW="v7\.5\.1" -DM_OLD="v7.1.1" -DM_NEW="v7.5.1" +OPERATOR_OLD="v1.6.0-beta.1" +OPERATOR_NEW="v1.6.0" +TIDB_OLD="v7.5.1" +TIDB_NEW="v8.1.0" +DM_OLD="v7.5.1" +DM_NEW="v8.1.0" 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 8910baa185d..96d8df4a73f 100644 --- a/images/tidb-backup-manager/Dockerfile +++ b/images/tidb-backup-manager/Dockerfile @@ -2,7 +2,7 @@ FROM pingcap/pingcap-base:v1 ARG TARGETARCH ARG RCLONE_VERSION=v1.57.0 ARG SHUSH_VERSION=v1.4.0 -ARG TOOLKIT_VERSION=v7.5.1 +ARG TOOLKIT_VERSION=v8.1.0 RUN dnf install -y ca-certificates bind-utils wget nc unzip && dnf clean all RUN wget -nv https://github.com/ncw/rclone/releases/download/${RCLONE_VERSION}/rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip \ diff --git a/pkg/client/go.mod b/pkg/client/go.mod index d1f12c0da8a..adb67da2290 100644 --- a/pkg/client/go.mod +++ b/pkg/client/go.mod @@ -3,7 +3,7 @@ module github.com/pingcap/tidb-operator/pkg/client go 1.21 require ( - github.com/pingcap/tidb-operator/pkg/apis v1.6.0-beta.1 + github.com/pingcap/tidb-operator/pkg/apis v1.6.0 k8s.io/apimachinery v0.28.5 k8s.io/client-go v0.28.5 ) diff --git a/tests/e2e/util/image/image.go b/tests/e2e/util/image/image.go index 4671c437f7e..27b426b8e1c 100644 --- a/tests/e2e/util/image/image.go +++ b/tests/e2e/util/image/image.go @@ -55,8 +55,7 @@ const ( DMV2 = TiDBLatest TiDBNGMonitoringLatest = TiDBLatest HelperImage = "alpine:3.16.0" - // TODO: replace this after we have `8.0.0` release - PDMSImage = "v7.6.0" + PDMSImage = "v8.1.0" ) func ListImages() []string { diff --git a/tests/pkg/fixture/fixture.go b/tests/pkg/fixture/fixture.go index 285cb274d79..e039dec66e0 100644 --- a/tests/pkg/fixture/fixture.go +++ b/tests/pkg/fixture/fixture.go @@ -798,29 +798,17 @@ func AddPDMSForTidbCluster(tc *v1alpha1.TidbCluster) *v1alpha1.TidbCluster { if tc.Spec.PDMS != nil { return tc } - pdmsImage := "hub.pingcap.net/devbuild/pd" - version := "v8.0.0-4193" - // TODO: remove pd version when released pdms - tc.Spec.PD.BaseImage = "hub.pingcap.net/devbuild/pd" - tc.Spec.PD.Version = &version + pdmsImage := "pingcap/pd" tc.Spec.PDMS = []*v1alpha1.PDMSSpec{ { - Name: tsoService, - // TODO: replace pdms image when released pdms - BaseImage: &pdmsImage, - ComponentSpec: v1alpha1.ComponentSpec{ - Version: &version, - }, + Name: tsoService, + BaseImage: &pdmsImage, Replicas: 2, ResourceRequirements: WithStorage(BurstableSmall, "10Gi"), }, { - Name: schedulingService, - // TODO: replace pdms image when released pdms - BaseImage: &pdmsImage, - ComponentSpec: v1alpha1.ComponentSpec{ - Version: &version, - }, + Name: schedulingService, + BaseImage: &pdmsImage, Replicas: 1, ResourceRequirements: WithStorage(BurstableSmall, "10Gi"), },