Merge branch 'patch/2.0.1_compat' into feat/topology

oceanbase · Oct 25, 2023 · 90342c3 · 90342c3
2 parents c9325d4 + 04a8256
commit 90342c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/config/crd/bases/oceanbase.oceanbase.com_obtenantbackuppolicies.yaml b/config/crd/bases/oceanbase.oceanbase.com_obtenantbackuppolicies.yaml
@@ -942,7 +942,7 @@ spec:
                     type: string
                   create_time:
                     type: string
-                  gmt_create_time:
+                  gmt_create:
                     type: string
                   in_recyclebin:
                     type: string

diff --git a/pkg/oceanbase/model/system.go b/pkg/oceanbase/model/system.go
@@ -33,7 +33,7 @@ type OBTenant struct {
 	RecoveryUntilScn         int64  `json:"recovery_until_scn" db:"recovery_until_scn"`
 	LogMode                  string `json:"log_mode" db:"log_mode"`
 	ArbitrationServiceStatus string `json:"arbitration_service_status" db:"arbitration_service_status"`
-	GmtCreateTime            string `json:"gmt_create_time,omitempty" db:"gmt_create"`
+	GmtCreate                string `json:"gmt_create,omitempty" db:"gmt_create"`
 	SwitchoverStatus         string `json:"switchover_status,omitempty" db:"switchover_status"`
 	SwitchoverEpoch          int64  `json:"switchover_epoch,omitempty" db:"switchover_epoch"`
 	UnitNum                  int64  `json:"unit_num,omitempty" db:"unit_num"`

diff --git a/pkg/oceanbase/model/tenant.go b/pkg/oceanbase/model/tenant.go
@@ -21,7 +21,7 @@ type Tenant struct {
 	Locality         string `json:"locality" db:"locality"`
 	PreviousLocality string `json:"previous_locality" db:"previous_locality"`
 	Status           string `json:"status" db:"status"`
-	GmtCreateTime    string `json:"gmt_create_time" db:"gmt_create"`
+	GmtCreate        string `json:"gmt_create" db:"gmt_create"`
 }
 
 type Replica struct {