feat: restore tenant from backup, activate or replay

oceanbase · Sep 25, 2023 · 19d4648 · 19d4648
1 parent 5534d68
commit 19d4648
Show file tree

Hide file tree

Showing 20 changed files with 783 additions and 182 deletions.
diff --git a/Makefile b/Makefile
@@ -205,4 +205,20 @@ commit-hook: $(GOLANGCI_LINT) ## Install commit hook.
 	touch .git/hooks/pre-commit
 	chmod +x .git/hooks/pre-commit
 	echo "#!/bin/sh" > .git/hooks/pre-commit
-	echo "make lint" >> .git/hooks/pre-commit
+	echo "make lint" >> .git/hooks/pre-commit
+
+.PHONY: connect
+connect:
+ifdef TENANT
+	mysq -h$(shell kubectl get pods -o jsonpath='{.items[0].status.podIP}') -P2881 -A -uroot@${TENANT}
+else
+	mysql -h$(shell kubectl get pods -o jsonpath='{.items[0].status.podIP}') -P2881 -A -uroot -p
+endif
+
+.PHONY: connectob
+connectob:
+ifdef TENANT
+	mysq -h$(shell kubectl get pods -o jsonpath='{.items[0].status.podIP}') -P2881 -A -uroot@${TENANT} -Doceanbase
+else
+	mysql -h$(shell kubectl get pods -o jsonpath='{.items[0].status.podIP}') -P2881 -A -uroot -p -Doceanbase
+endif
diff --git a/api/v1alpha1/obtenantrestore_types.go b/api/v1alpha1/obtenantrestore_types.go
@@ -60,6 +60,11 @@ func (in *OBTenantRestoreStatus) DeepCopyInto(out *OBTenantRestoreStatus) {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.status`
+//+kubebuilder:printcolumn:name="TargetTenant",type=string,JSONPath=`.spec.targetTenant`
+//+kubebuilder:printcolumn:name="TargetCluster",type=string,JSONPath=`.spec.targetCluster`
+//+kubebuilder:printcolumn:name="RestoreRole",type=string,JSONPath=`.spec.restoreRole`
+//+kubebuilder:printcolumn:name="StatusInDB",type=string,JSONPath=`.status.restoreProgress.status`
 
 // OBTenantRestore is the Schema for the obtenantrestores API
 // An instance of OBTenantRestore stands for a tenant restore job

diff --git a/config/crd/bases/oceanbase.oceanbase.com_obtenantrestores.yaml b/config/crd/bases/oceanbase.oceanbase.com_obtenantrestores.yaml
@@ -14,7 +14,23 @@ spec:
     singular: obtenantrestore
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .status.status
+      name: Status
+      type: string
+    - jsonPath: .spec.targetTenant
+      name: TargetTenant
+      type: string
+    - jsonPath: .spec.targetCluster
+      name: TargetCluster
+      type: string
+    - jsonPath: .spec.restoreRole
+      name: RestoreRole
+      type: string
+    - jsonPath: .status.restoreProgress.status
+      name: StatusInDB
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: OBTenantRestore is the Schema for the obtenantrestores API An

diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
@@ -53,3 +53,4 @@ spec:
         - "--health-probe-bind-address=:8081"
         - "--metrics-bind-address=127.0.0.1:8080"
         - "--leader-elect"
+        - "--manager-namespace=oceanbase-system"
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: oceanbasedev/ob-operator
-  newTag: 2.0.0-alpha.8
+  newTag: 2.0.0