Merge remote-tracking branch 'origin/2.0.x_dev' into feature/tenant-r…

…estore

Conflicts:
	Makefile
	api/constants/restore.go
	api/v1alpha1/obtenant_types.go
	api/v1alpha1/obtenant_webhook.go
	api/v1alpha1/obtenantrestore_types.go
	cmd/main.go
	config/crd/bases/oceanbase.oceanbase.com_obtenantrestores.yaml
	config/crd/bases/oceanbase.oceanbase.com_obtenants.yaml
	pkg/const/status/tenantstatus/obtenant_status.go
	pkg/controller/obtenantoperation_controller.go
	pkg/controller/obtenantrestore_controller.go
	pkg/oceanbase/const/sql/restore.go
	pkg/oceanbase/operation/restore.go
	pkg/oceanbase/test/restore_test.go
	pkg/resource/obtenant_manager.go
	pkg/resource/obtenantrestore_manager.go
	pkg/resource/obtenantrestore_task.go
	pkg/resource/obzone_task.go
	pkg/resource/template_manager.go
	pkg/task/const/flow/name/task_flow_names.go
	pkg/task/const/task/name/restore.go
	pkg/task/const/task/name/task_names.go
	pkg/task/obtenant_flow.go

config/crd/kustomization.yaml

@@ -23,7 +23,7 @@ patchesStrategicMerge:
 # - patches/webhook_in_obzones.yaml
 # - patches/webhook_in_observers.yaml
 # - patches/webhook_in_obparameters.yaml
-# - patches/webhook_in_obtenants.yaml
+- patches/webhook_in_obtenants.yaml
 # - patches/webhook_in_obunits.yaml
 # - patches/webhook_in_obclusterbackups.yaml
 # - patches/webhook_in_obtenantbackups.yaml
@@ -39,7 +39,7 @@ patchesStrategicMerge:
 # - patches/cainjection_in_obzones.yaml
 # - patches/cainjection_in_observers.yaml
 # - patches/cainjection_in_obparameters.yaml
-# - patches/cainjection_in_obtenants.yaml
+- patches/cainjection_in_obtenants.yaml
 # - patches/cainjection_in_obunits.yaml
 # - patches/cainjection_in_obclusterbackups.yaml
 # - patches/cainjection_in_obtenantbackups.yaml