diff --git a/charts/br-federation/values.yaml b/charts/br-federation/values.yaml index 8666f59e023..4439f02db09 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 +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 index a57eec5fb7f..6ab253af1b7 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: 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 index 53e2b58c9b1..d241984aaf6 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: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 index 4ef8ae02e15..a93d7d8b1fb 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.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 index b2d5129b50a..6ed29bdd7ef 100644 --- 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 index fd54a3ac169..cc77b35e3d9 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: 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 index 34514898fc3..4fb71a81d10 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: v8.1.0 + version: v8.5.0 diff --git a/deploy/aliyun/variables.tf b/deploy/aliyun/variables.tf index a3affbbf54e..96937083ec8 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" + 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 index ba6a2bcfbbf..7382a778420 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: 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 index fb5146d65de..966072b578b 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: v8.1.0 + version: v8.5.0 diff --git a/deploy/aws/variables.tf b/deploy/aws/variables.tf index 5bef21469b3..55d3babccf7 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" + 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 index a9763f6cffd..a129520461a 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: 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 index 2c63e3159b0..7201e1648df 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: 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 index 75b59ab0099..be169651aa8 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 = "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 index 80fd5fa5064..8543b0b7d08 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 = "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 index 4fc39eddff5..459418f6fa3 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 = "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 index 462a9482ba5..db61ce86d01 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 = "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 index abf11e81536..2465065cd11 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 = "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 index 09961d818bc..04b38dae5ec 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: 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 index cdcd37f1528..764ea6cc5d4 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: 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 index cf8d36c83c2..69cb8d3e5e3 100644 --- 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 index 83368998e9c..b2a2cd00391 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: 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 index 652d7224de9..90a378cb9a1 100644 --- 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 index 00b0e01426b..4a2e5c554f0 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: 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 index 325d10ad432..5889bb7accc 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: 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 index 521932f2a49..ab9caca54d1 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: 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 index 70f5481c299..aca825b60e5 100644 --- 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 index b0359db7aa9..1538ef609a5 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: 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 index 4109fd4bb48..a57355870f0 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: 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 index 05353bf3b2d..823c8070212 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: 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 index 0a38ea20147..ed19e8d9f68 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: 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 index 59e3bae3c0e..9fd06376ef4 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: 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 index 05353bf3b2d..823c8070212 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: 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 index c10b433d937..f3405f189d2 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: 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 index 2329ee43463..ddf0a9d8eab 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: v8.1.0 + version: v8.5.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 6f6a294bc5a..96781eb9bb6 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: v8.1.0 + version: v8.5.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true @@ -38,7 +38,7 @@ spec: replicas: 2 tikv: baseImage: pingcap/tikv - version: v8.1.0 + version: v8.5.0 maxFailoverCount: 0 # If only 1 TiKV is deployed, the TiKV region leader # cannot be transferred during upgrade, so we have @@ -61,7 +61,7 @@ spec: max-open-files: 256 tidb: baseImage: pingcap/tidb - version: v8.1.0 + version: v8.5.0 maxFailoverCount: 0 replicas: 1 service: diff --git a/examples/basic/tidb-cluster.yaml b/examples/basic/tidb-cluster.yaml index 1aaf4123c07..3d3224a2d62 100644 --- a/examples/basic/tidb-cluster.yaml +++ b/examples/basic/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/tidb-monitor.yaml b/examples/basic/tidb-monitor.yaml index 9e1259d4e44..2fba370416b 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: v8.1.0 + version: v8.5.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 a6ae717e6a9..183f2120869 100644 --- a/examples/dm/dm-cluster.yaml +++ b/examples/dm/dm-cluster.yaml @@ -3,7 +3,7 @@ kind: DMCluster metadata: name: basic spec: - version: v8.1.0 + version: v8.5.0 pvReclaimPolicy: Retain discovery: {} master: diff --git a/examples/dm/dm-monitor.yaml b/examples/dm/dm-monitor.yaml index 26dd7e0a63f..81905bc80a9 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: v8.1.0 + version: v8.5.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: v8.1.0 + version: v8.5.0 imagePullPolicy: IfNotPresent diff --git a/examples/gcp/tidb-cluster.yaml b/examples/gcp/tidb-cluster.yaml index f7338a5cf06..4e9f05e63f1 100644 --- a/examples/gcp/tidb-cluster.yaml +++ b/examples/gcp/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/gcp/tidb-monitor.yaml b/examples/gcp/tidb-monitor.yaml index c693ad02cf7..e820e08b689 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: v8.1.0 + version: v8.5.0 kubePrometheusURL: "" persistent: true prometheus: diff --git a/examples/heterogeneous-tls/heterogeneous-cluster.yaml b/examples/heterogeneous-tls/heterogeneous-cluster.yaml index 52fdd7ae881..c41ca69fae7 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: v8.1.0 + version: v8.5.0 timezone: UTC pvReclaimPolicy: Retain discovery: {} @@ -38,7 +38,7 @@ spec: tiflash: baseImage: pingcap/tiflash maxFailoverCount: 0 - version: v8.1.0 + version: v8.5.0 maxFailoverCount: 1 replicas: 1 storageClaims: diff --git a/examples/heterogeneous-tls/tidb-cluster.yaml b/examples/heterogeneous-tls/tidb-cluster.yaml index 95f8a619f9f..8e2f98d2ed3 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: v8.1.0 + version: v8.5.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous-tls/tidb-monitor.yaml b/examples/heterogeneous-tls/tidb-monitor.yaml index c9785c89371..ce08a8fa328 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: v8.1.0 + version: v8.5.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 98978caead9..fb96585c50e 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: v8.1.0 + version: v8.5.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/heterogeneous/tidb-cluster.yaml b/examples/heterogeneous/tidb-cluster.yaml index 45c993ca74b..83d66792271 100644 --- a/examples/heterogeneous/tidb-cluster.yaml +++ b/examples/heterogeneous/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/heterogeneous/tidb-monitor.yaml b/examples/heterogeneous/tidb-monitor.yaml index 9360d47d41b..615b5913794 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: v8.1.0 + version: v8.5.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 1592f361134..de3ae6918ab 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: v8.1.0 + version: v8.5.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/istio/tidb-cluster.yaml b/examples/istio/tidb-cluster.yaml index ef8f6025562..8aa262c4971 100644 --- a/examples/istio/tidb-cluster.yaml +++ b/examples/istio/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/istio/tidb-monitor.yaml b/examples/istio/tidb-monitor.yaml index 9e1259d4e44..2fba370416b 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: v8.1.0 + version: v8.5.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 c3dd538955e..6f56cdc602c 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: v8.1.0 + version: v8.5.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 2ee684276ed..a75a5a47fdf 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: v8.1.0 + version: v8.5.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 18f5cdf5c11..7f0dd2303d5 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: v8.1.0 + version: v8.5.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 cd7e5be0751..7470716f846 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: v8.1.0 + version: v8.5.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 f1796a6bfd5..63a8bfbad61 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: v8.1.0 + version: v8.5.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 18f5cdf5c11..7f0dd2303d5 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: v8.1.0 + version: v8.5.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 7cf161efcae..d4293c78d11 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: v8.1.0 + version: v8.5.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 3d7e13c3f83..1d632986a36 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: v8.1.0 + version: v8.5.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 18f5cdf5c11..7f0dd2303d5 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: v8.1.0 + version: v8.5.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 061c5dba8af..b490f4c0eac 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: v8.1.0 + version: v8.5.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 5055544dd4b..2758b1f7b2e 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: v8.1.0 + version: v8.5.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 061c5dba8af..b490f4c0eac 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: v8.1.0 + version: v8.5.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/monitor-shards/tidb-monitor.yaml b/examples/monitor-shards/tidb-monitor.yaml index a1ac0df3cbf..b6050cafaa6 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: v8.1.0 + version: v8.5.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 197de2d42b2..ec30369ad55 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: v8.1.0 + version: v8.5.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 7b85a86e84c..3a5fea204f1 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: v8.1.0 + version: v8.5.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 fcf89b9bb9b..f728fefa9b6 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: v8.1.0 + version: v8.5.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 4b1194a043b..a7f905f83fe 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: v8.1.0 + version: v8.5.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 712823983b8..33ef1bbc1b5 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: v8.1.0 + version: v8.5.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 4d5d48feb50..d9725e70822 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: v8.1.0 + version: v8.5.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 92ee2dffe30..2290a374b4c 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: v8.1.0 + version: v8.5.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 a90ec86cfb2..4d9675f2a6d 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: v8.1.0 + version: v8.5.0 timezone: UTC pvReclaimPolicy: Delete discovery: {} diff --git a/examples/namespaced/tidb-cluster.yaml b/examples/namespaced/tidb-cluster.yaml index 061c5dba8af..b490f4c0eac 100644 --- a/examples/namespaced/tidb-cluster.yaml +++ b/examples/namespaced/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/namespaced/tidb-monitor.yaml b/examples/namespaced/tidb-monitor.yaml index 5feb3d770df..79d8a6c1eab 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: v8.1.0 + version: v8.5.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 f1d3ca1f059..354926905ee 100644 --- a/examples/podpatch/tidb-cluster.yaml +++ b/examples/podpatch/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/podpatch/tidb-monitor.yaml b/examples/podpatch/tidb-monitor.yaml index 6410854ce7f..f6a02dba747 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: v8.1.0 + version: v8.5.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 3b156991ccb..eb788b0c2e2 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: v8.1.0 + version: v8.5.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/readiness/tidb-cluster.yaml b/examples/readiness/tidb-cluster.yaml index be13a1583db..0a4cc63a807 100644 --- a/examples/readiness/tidb-cluster.yaml +++ b/examples/readiness/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/selfsigned-tls/tidb-cluster.yaml b/examples/selfsigned-tls/tidb-cluster.yaml index 60d63294611..c2fc1962df0 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: v8.1.0 + version: v8.5.0 timezone: UTC pvReclaimPolicy: Retain enableDynamicConfiguration: true diff --git a/examples/tiflash/tidb-cluster.yaml b/examples/tiflash/tidb-cluster.yaml index f319167ebb0..c236ac1530a 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: v8.1.0 + version: v8.5.0 diff --git a/examples/tiflash/tidb-monitor.yaml b/examples/tiflash/tidb-monitor.yaml index 11bc5fb24b5..6bbcc8774a7 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: v8.1.0 + version: v8.5.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 ef8f6025562..8aa262c4971 100644 --- a/examples/tngm/tidb-cluster.yaml +++ b/examples/tngm/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/go.mod b/go.mod index a07355c4335..b9f939c370b 100644 --- a/go.mod +++ b/go.mod @@ -38,8 +38,8 @@ require ( github.com/pingcap/advanced-statefulset/client v1.17.1-0.20241017064830-af926cc6da0d 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 - 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 github.com/pingcap/tiproxy/lib v0.0.0-20230907130944-eb5b4b9c9e79 github.com/prometheus/client_golang v1.17.0 github.com/prometheus/client_model v0.6.1 diff --git a/hack/bump-version.sh b/hack/bump-version.sh index 073474917eb..b81a7248d62 100755 --- a/hack/bump-version.sh +++ b/hack/bump-version.sh @@ -22,12 +22,10 @@ if [[ "$OSTYPE" == "darwin"* ]]; then fi # parameters -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" +OPERATOR_OLD="v1.6.0" +OPERATOR_NEW="v1.6.1" +TIDB_OLD="v8.1.0" +TIDB_NEW="v8.5.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" @@ -38,6 +36,4 @@ 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 ./ -name "*\.mod" | xargs $SED_BIN -i -E "s/(github.com\/pingcap\/tidb-operator\/.+) ($OPERATOR_OLD)/\1 $OPERATOR_NEW/g" diff --git a/images/tidb-backup-manager/Dockerfile b/images/tidb-backup-manager/Dockerfile index d0d80ebf542..6e7ae28735a 100644 --- a/images/tidb-backup-manager/Dockerfile +++ b/images/tidb-backup-manager/Dockerfile @@ -2,7 +2,7 @@ FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.2 ARG TARGETARCH ARG RCLONE_VERSION=v1.68.1 ARG SHUSH_VERSION=v1.5.5 -ARG TOOLKIT_VERSION=v8.1.0 +ARG TOOLKIT_VERSION=v8.5.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 f9953c06402..9a9deb87239 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.23.2 require ( - github.com/pingcap/tidb-operator/pkg/apis v1.6.0 + github.com/pingcap/tidb-operator/pkg/apis v1.6.1 k8s.io/apimachinery v0.28.14 k8s.io/client-go v0.28.14 )