bump TiDB Operator to 1.6.1 and TiDB to 8.5.0 (#5990)

Co-authored-by: csuzhangxc <[email protected]>
pingcap · Dec 20, 2024 · ce7a8ef · ce7a8ef
1 parent 7285ec1
commit ce7a8ef
Show file tree

Hide file tree

Showing 86 changed files with 105 additions and 109 deletions.
diff --git 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
+image: pingcap/br-federation-manager:v1.6.1
 imagePullPolicy: IfNotPresent
 # imagePullSecrets: []
 

diff --git 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: v8.1.0
+clusterVersion: v8.5.0
 
 baseImage: pingcap/tidb-binlog
 imagePullPolicy: IfNotPresent

diff --git 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:v8.1.0
+image: pingcap/tidb-lightning:v8.5.0
 imagePullPolicy: IfNotPresent
 # imagePullSecrets: []
 

diff --git 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.6.0
+operatorImage: pingcap/tidb-operator:v1.6.1
 imagePullPolicy: IfNotPresent
 # imagePullSecrets: []
 
 # tidbBackupManagerImage is tidb backup manager image
-tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.6.0
+tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.6.1
 
 #
 # Enable or disable tidb-operator features:

diff --git a/cmd/http-service/go.mod b/cmd/http-service/go.mod
@@ -6,8 +6,8 @@ require (
 	github.com/gin-gonic/gin v1.10.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0
 	github.com/pingcap/log v1.1.1-0.20240314023424-862ccc32f18d
-	github.com/pingcap/tidb-operator/pkg/apis v1.6.0
-	github.com/pingcap/tidb-operator/pkg/client v1.6.0
+	github.com/pingcap/tidb-operator/pkg/apis v1.6.1
+	github.com/pingcap/tidb-operator/pkg/client v1.6.1
 	go.uber.org/zap v1.27.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28
 	google.golang.org/grpc v1.67.1

diff --git 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: v8.1.0
+    version: v8.5.0
   kubePrometheusURL: ""
   nodeSelector: {}
   persistent: true

diff --git 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: v8.1.0
+  version: v8.5.0
diff --git 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"
+  default = "v1.6.1"
 }
 
 variable "operator_helm_values" {
@@ -36,7 +36,7 @@ variable "cluster_name" {
 
 variable "tidb_version" {
   description = "TiDB cluster version"
-  default     = "v8.1.0"
+  default     = "v8.5.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
@@ -44,7 +44,7 @@ spec:
     #  requests:
     #    cpu: 50m
     #    memory: 64Mi
-    version: v8.1.0
+    version: v8.5.0
   kubePrometheusURL: ""
   nodeSelector: {}
   persistent: true

diff --git 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: v8.1.0
+  version: v8.5.0
diff --git 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"
+  default     = "v1.6.1"
 }
 
 variable "operator_values" {
@@ -80,7 +80,7 @@ variable "bastion_instance_type" {
 
 # For aws tutorials compatiablity
 variable "default_cluster_version" {
-  default = "v8.1.0"
+  default = "v8.5.0"
 }
 
 variable "default_cluster_pd_count" {

diff --git 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: v8.1.0
+    version: v8.5.0
   kubePrometheusURL: ""
   nodeSelector: {}
   persistent: true

diff --git 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: v8.1.0
+  version: v8.5.0
   timezone: UTC
   pvReclaimPolicy: Retain
   schedulerName: tidb-scheduler

diff --git a/deploy/gcp/variables.tf b/deploy/gcp/variables.tf
@@ -24,11 +24,11 @@ variable "node_locations" {
 
 variable "tidb_version" {
   description = "TiDB version"
-  default     = "v8.1.0"
+  default     = "v8.5.0"
 }
 
 variable "tidb_operator_version" {
-  default = "v1.6.0"
+  default = "v1.6.1"
 }
 
 variable "tidb_operator_chart_version" {

diff --git 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     = "v8.1.0"
+  default     = "v8.5.0"
 }
 
 variable "tidb_cluster_chart_version" {

diff --git 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 = "v8.1.0"
+  default = "v8.5.0"
 }
 
 variable "ssh_key_name" {

diff --git 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     = "v8.1.0"
+  default     = "v8.5.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
@@ -20,7 +20,7 @@ variable "cluster_name" {
 
 variable "cluster_version" {
   type    = string
-  default = "v8.1.0"
+  default = "v8.5.0"
 }
 
 variable "pd_count" {

diff --git 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: v8.1.0
+  version: v8.5.0
   timezone: UTC
   pvReclaimPolicy: Retain
   enableDynamicConfiguration: true

diff --git 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: v8.1.0
+  version: v8.5.0
   timezone: UTC
   pvReclaimPolicy: Retain
   enableDynamicConfiguration: true

diff --git a/examples/advanced/tidb-cluster.yaml b/examples/advanced/tidb-cluster.yaml
@@ -10,7 +10,7 @@ spec:
   #######################
 
   ## TiDB cluster version
-  version: "v8.1.0"
+  version: "v8.5.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: "v8.1.0"
+    # version: "v8.5.0"
     # imagePullPolicy: IfNotPresent
     # imagePullSecrets:
     # - name: secretName
@@ -408,7 +408,7 @@ spec:
     ###############################
 
     ## The following block overwrites TiDB cluster-level configurations in `spec`
-    # version: "v8.1.0"
+    # version: "v8.5.0"
     # imagePullPolicy: IfNotPresent
     # imagePullSecrets:
     # - name: secretName
@@ -619,7 +619,7 @@ spec:
     ###############################
 
     ## The following block overwrites TiDB cluster-level configurations in `spec`
-    # version: "v8.1.0"
+    # version: "v8.5.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: "v8.1.0"
+  #   version: "v8.5.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: "v8.1.0"
+  #   version: "v8.5.0"
   #   replicas: 3
   #   storageClassName: local-storage
   #   requests:
@@ -897,7 +897,7 @@ spec:
   #   # Basic TiFlash Configuration #
   #   ###############################
   #   baseImage: pingcap/tiflash
-  #   version: "v8.1.0"
+  #   version: "v8.5.0"
   #   replicas: 1
   #   # limits:
   #   #   cpu: 2000m

diff --git 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: v8.1.0
+    version: v8.5.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
@@ -3,7 +3,7 @@ kind: TidbCluster
 metadata:
   name: basic
 spec:
-  version: v8.1.0
+  version: v8.5.0
   timezone: UTC
   configUpdateStrategy: RollingUpdate
   pvReclaimPolicy: Retain

diff --git 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: v8.1.0
+    version: v8.5.0
   kubePrometheusURL: ""
   persistent: true
   prometheus:

diff --git 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: v8.1.0
+  version: v8.5.0
   timezone: UTC
   pvReclaimPolicy: Retain
   enableDynamicConfiguration: true

diff --git 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: v8.1.0
+    version: v8.5.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
@@ -3,7 +3,7 @@ kind: TidbCluster
 metadata:
   name: basic
 spec:
-  version: v8.1.0
+  version: v8.5.0
   timezone: UTC
   configUpdateStrategy: RollingUpdate
   pvReclaimPolicy: Retain

diff --git 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: v8.1.0
+    version: v8.5.0
   kubePrometheusURL: ""
   persistent: true
   prometheus:

diff --git 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: v8.1.0
+  version: v8.5.0
   timezone: UTC
   pvReclaimPolicy: Retain
   enableDynamicConfiguration: true

diff --git 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: v8.1.0
+    version: v8.5.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
@@ -6,7 +6,7 @@ kind: TidbCluster
 metadata:
   name: basic
 spec:
-  version: v8.1.0
+  version: v8.5.0
   timezone: UTC
   pvReclaimPolicy: Retain
   enableDynamicConfiguration: true

diff --git 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: v8.1.0
+  version: v8.5.0
   timezone: UTC
   pvReclaimPolicy: Retain
   enableDynamicConfiguration: true

diff --git 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: v8.1.0
+    version: v8.5.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
@@ -8,7 +8,7 @@ metadata:
 spec:
   tlsCluster:
     enabled: true
-  version: v8.1.0
+  version: v8.5.0
   timezone: UTC
   pvReclaimPolicy: Delete
   enableDynamicConfiguration: true

diff --git 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: v8.1.0
+    version: v8.5.0
   reloader:
     baseImage: pingcap/tidb-monitor-reloader
     version: v1.0.1