Merge branch 'master' into no-evict

pingcap · Jun 29, 2023 · bb73e82 · bb73e82
2 parents e6e15e9 + a150c2f
commit bb73e82
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/charts/br-federation/values.yaml b/charts/br-federation/values.yaml
@@ -6,7 +6,7 @@ rbac:
 # timezone is the default system timzone
 timezone: UTC
 
-image: pingcap/br-federation-manager:v1.6.0-alpha.1
+image: pingcap/br-federation-manager:v1.6.0-alpha.2
 imagePullPolicy: IfNotPresent
 # imagePullSecrets: []
 

diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml
@@ -38,7 +38,7 @@ services:
     type: ClusterIP
 
 discovery:
-  image: pingcap/tidb-operator:v1.6.0-alpha.1
+  image: pingcap/tidb-operator:v1.6.0-alpha.2
   imagePullPolicy: IfNotPresent
   resources:
     limits:

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

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-alpha.1"
+  default = "v1.6.0-alpha.2"
 }
 
 variable "operator_helm_values" {

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-alpha.1"
+  default     = "v1.6.0-alpha.2"
 }
 
 variable "operator_values" {

diff --git a/deploy/gcp/variables.tf b/deploy/gcp/variables.tf
@@ -28,7 +28,7 @@ variable "tidb_version" {
 }
 
 variable "tidb_operator_version" {
-  default = "v1.6.0-alpha.1"
+  default = "v1.6.0-alpha.2"
 }
 
 variable "tidb_operator_chart_version" {

diff --git a/go.mod b/go.mod
@@ -34,8 +34,8 @@ require (
 	github.com/pingcap/advanced-statefulset/client v1.17.1-0.20230403114412-d141a788a127
 	github.com/pingcap/errors v0.11.4
 	github.com/pingcap/kvproto v0.0.0-20200927054727-1290113160f0
-	github.com/pingcap/tidb-operator/pkg/apis v1.6.0-alpha.1
-	github.com/pingcap/tidb-operator/pkg/client v1.6.0-alpha.1
+	github.com/pingcap/tidb-operator/pkg/apis v1.6.0-alpha.2
+	github.com/pingcap/tidb-operator/pkg/client v1.6.0-alpha.2
 	github.com/prometheus/client_golang v1.7.1
 	github.com/prometheus/client_model v0.2.0
 	github.com/prometheus/common v0.26.0

diff --git a/hack/bump-version.sh b/hack/bump-version.sh
@@ -22,8 +22,8 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 fi
 
 # parameters
-OPERATOR_OLD="v1\.5\.0-beta.1"
-OPERATOR_NEW="v1\.6.0-alpha.1"
+OPERATOR_OLD="v1\.6\.0-alpha.1"
+OPERATOR_NEW="v1\.6\.0-alpha.2"
 TIDB_OLD="v6\.1\.0"
 TIDB_NEW="v6\.5\.0"
 DM_OLD="v6.1.0"

diff --git a/pkg/client/go.mod b/pkg/client/go.mod
@@ -3,7 +3,7 @@ module github.com/pingcap/tidb-operator/pkg/client
 go 1.19
 
 require (
-	github.com/pingcap/tidb-operator/pkg/apis v1.6.0-alpha.1
+	github.com/pingcap/tidb-operator/pkg/apis v1.6.0-alpha.2
 	k8s.io/apimachinery v0.20.15
 	k8s.io/client-go v0.20.15
 )