Merge branch 'master' of github.com:oceanbase/ob-operator into wt-dev-clusterDetail

Author: TianWuwt

Makefile

@@ -1,6 +1,6 @@
 include make/*
 
-VERSION ?= 2.3.0
+VERSION ?= 2.3.1
 # Image URL to use all building/pushing image targets
 IMG ?= quay.io/oceanbase/ob-operator:${VERSION}
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.

README-CN.md

@@ -15,7 +15,7 @@ ob-operator 是满足 Kubernetes Operator 扩展范式的自动化工具，可
 ob-operator 依赖 [cert-manager](https://cert-manager.io/docs/), cert-manager 的安装可以参考对应的[安装文档](https://cert-manager.io/docs/installation/)，如果您无法访问官方制品托管在 `quay.io` 镜像站的镜像，可通过下面的指令安装我们转托在 `docker.io` 中的制品：
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/deploy/cert-manager.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/deploy/cert-manager.yaml
 ```
 
 本例子中的 OceanBase 集群存储依赖 [local-path-provisioner](https://github.com/rancher/local-path-provisioner) 提供, 需要提前进行安装并确保其存储目的地有足够大的磁盘空间。如果您计划在生产环境部署，推荐使用其他的存储解决方案。我们在[存储兼容性](#存储兼容性)一节提供了我们测试过的存储兼容性结果。
@@ -29,7 +29,7 @@ kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_r
 - 稳定版本
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/deploy/operator.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/deploy/operator.yaml
 ```
 
 - 开发版本
@@ -97,7 +97,7 @@ kubectl create secret generic root-password --from-literal=password='root_passwo
 通过以下命令即可在 K8s 集群中部署 OceanBase：
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/example/quickstart/obcluster.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/example/quickstart/obcluster.yaml
 ```
 
 一般初始化集群需要 2 分钟左右的时间，执行以下命令，查询集群状态，当集群状态变成 running 之后表示集群创建和初始化成功：
@@ -162,6 +162,8 @@ ob-operator 以 kubebuilder 为基础，通过统一的资源管理器接口、
 
 ![ob-operator 架构设计](./docsite/static/img/ob-operator-arch.png)
 
+![ob-operator 任务管理器](./docsite/static/img/ob-operator-task-manager-arch.png)
+
 有关架构细节可参见[架构设计文档](https://oceanbase.github.io/ob-operator/zh-Hans/docs/developer/arch)。
 
 ## 特性
@@ -225,6 +227,7 @@ ob-operator 使用 [kubebuilder](https://book.kubebuilder.io/introduction) 项
 ## 参与开发
 
 - [提出 Issue](https://github.com/oceanbase/ob-operator/issues)
+- [发起 Discussion](https://github.com/oceanbase/ob-operator/discussions)
 - [发起 Pull request](https://github.com/oceanbase/ob-operator/pulls)
 
 ## 许可证

README.md

@@ -16,7 +16,7 @@ ob-operator relies on [cert-manager](https://cert-manager.io/docs/) for certific
 If you have trouble accessing `quay.io` image registry, our mirrored cert-manager manifests can be applied through following command:
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/deploy/cert-manager.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/deploy/cert-manager.yaml
 ```
 
 Storage of OceanBase cluster in this example relies on [local-path-provisioner](https://github.com/rancher/local-path-provisioner), which should be installed beforehand. You should confirm that there is enough disk space in storage destination of local-path-provisioner. If you decide to deploy OceanBase cluster in production environment, it is recommended to use other storage solutions. We have provided a compatible table for storage solutions that we tested in section [Storage Compatibility](#storage-compatibility).
@@ -30,7 +30,7 @@ You can deploy ob-operator in a Kubernetes cluster by executing the following co
 - Stable
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/deploy/operator.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/deploy/operator.yaml
 ```
 
 - Development
@@ -98,7 +98,7 @@ kubectl create secret generic root-password --from-literal=password='root_passwo
 You can deploy OceanBase in a Kubernetes cluster by executing the following command:
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/example/quickstart/obcluster.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/example/quickstart/obcluster.yaml
 ```
 
 It generally takes around 2 minutes to bootstrap a cluster. Execute the following command to check the status of the cluster. Once the cluster status changes to "running," it indicates that the cluster has been successfully created and bootstrapped:
@@ -160,10 +160,12 @@ Login with admin user and password.
 
 ## Project Architecture
 
-ob-operator is built on top of kubebuilder and provides control and management of OceanBase clusters and related applications through a unified resource manager interface, a global task manager instance, and a task flow mechanism for handling long-running tasks. The architecture diagram is approximately as follows:
+ob-operator is built on top of kubebuilder and provides control and management of OceanBase clusters and related applications through a unified resource manager interface, a global task manager instance, and a task flow mechanism for handling long-running tasks. The architecture diagram of ob-operator is approximately as follows:
 
 ![ob-operator Architecture](./docsite/static/img/ob-operator-arch.png)
 
+![ob-operator Task Manager Architecture](./docsite/static/img/ob-operator-task-manager-arch.png)
+
 For more detailed information about the architecture, please refer to the [Architecture Document](https://oceanbase.github.io/ob-operator/docs/developer/arch).
 
 ## Features
@@ -212,6 +214,8 @@ ob-operator is built using the [kubebuilder](https://book.kubebuilder.io/introdu
 - [Contributor Guidance](https://oceanbase.github.io/ob-operator/docs/developer/contributor-guidance)
 - [User Manual](https://oceanbase.github.io/ob-operator/docs/manual/what-is-ob-operator)
 
+github.com/oceanbase/ob-operator + /docs/developer/arch
+
 ## Getting Help
 
 If you encounter any issues while using ob-operator, please feel free to seek help through the following channels:
@@ -227,7 +231,8 @@ If you encounter any issues while using ob-operator, please feel free to seek he
 ## Contributing
 
 - [Submit an issue](https://github.com/oceanbase/ob-operator/issues)
-- [Create a Pull request](https://github.com/oceanbase/ob-operator/pulls)
+- [Create a discussion](https://github.com/oceanbase/ob-operator/discussions)
+- [Create a pull request](https://github.com/oceanbase/ob-operator/pulls)
 
 ## License
 

api/v1alpha1/observer_types.go

@@ -108,6 +108,8 @@ func (s *OBServer) SupportStaticIP() bool {
 	switch s.Status.CNI {
 	case oceanbaseconst.CNICalico:
 		return true
+	case oceanbaseconst.CNIKubeOvn:
+		return true
 	default:
 		annos := s.GetAnnotations()
 		if annos == nil {

api/v1alpha1/obtenant_webhook.go

@@ -290,9 +290,9 @@ func (r *OBTenant) validateMutation() error {
 	if r.Spec.Source != nil && r.Spec.Source.Restore != nil {
 		res := r.Spec.Source.Restore
 
-		if res.ArchiveSource == nil && res.BakDataSource == nil && res.SourceUri == "" {
+		if (res.ArchiveSource == nil || res.BakDataSource == nil) && res.SourceUri == "" {
 			allErrs = append(allErrs, field.Invalid(field.NewPath("spec").Child("source").Child("restore"), res, "Restore must have a source option, but both archiveSource, bakDataSource and sourceUri are nil now"))
-		} else {
+		} else if res.ArchiveSource != nil && res.BakDataSource != nil {
 			destErrs := errors.Join(
 				validateBackupDestination(cluster, res.ArchiveSource, "spec", "source", "restore", "archiveSource"),
 				validateBackupDestination(cluster, res.BakDataSource, "spec", "source", "restore", "bakDataSource"),

charts/ob-operator/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 2.3.0
+appVersion: 2.3.1
 description: A Helm chart for OB-Operator
 name: ob-operator
 type: application
-version: 2.3.0
+version: 2.3.1

charts/ob-operator/templates/operator.yaml

@@ -6779,11 +6779,19 @@ spec:
     - jsonPath: .status.status
       name: Status
       type: string
+    - jsonPath: .spec.clusterName
+      name: ClusterName
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    - jsonPath: .spec.clusterName
-      name: ClusterName
+    - jsonPath: .spec.observer.image
+      name: Image
+      priority: 1
+      type: string
+    - jsonPath: .spec.observer.storage
+      name: Storage
+      priority: 1
       type: string
     - jsonPath: .status.operationContext.tasks
       name: Tasks
@@ -21794,7 +21802,7 @@ spec:
         - --log-verbosity=0
         command:
         - /manager
-        image: quay.io/oceanbase/ob-operator:2.3.0
+        image: quay.io/oceanbase/ob-operator:2.3.1
         livenessProbe:
           httpGet:
             path: /healthz

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/oceanbase/ob-operator
-  newTag: 2.3.0
+  newTag: 2.3.1

deploy/operator.yaml

@@ -21815,7 +21815,7 @@ spec:
         - --log-verbosity=0
         command:
         - /manager
-        image: quay.io/oceanbase/ob-operator:2.3.0
+        image: quay.io/oceanbase/ob-operator:2.3.1
         livenessProbe:
           httpGet:
             path: /healthz

docsite/docs/developer/arch.md

@@ -12,12 +12,22 @@ ob-operator follows the [Operator pattern of Kubernetes](https://kubernetes.io/d
 * OBCluster: Represents an OceanBase cluster.
 * OBZone: Represents an OceanBase zone that belongs to an OBCluster.
 * OBServer: Represents an OceanBase observer resource that belongs to an OBZone.
-* OBParameter: Represents cluster parameters.
+* OBParameter: Represents cluster and tenant parameters.
 * OBTenant: Represents a tenant in the OceanBase cluster, which belongs to an OBCluster.
 * OBTenantBackupPolicy: Represents a scheduling backup policy for a tenant.
 * OBTenantBackup: Represents a backup task for a tenant.
 * OBTenantRestore: Represents a restore task for a tenant.
 * OBTenantOperation: Represents operational tasks for a tenant.
+* OBTenantVariable: Represents tenant variables.
+* OBClusterOperation: Represents operational tasks for a cluster.
+* OBResourceRescue: Represents a resource rescue task, which is used to recover resources that are stuck in an error state.
+* K8sCluster: Represents a Kubernetes cluster that is managed by ob-operator.
+
+## Diagram
+
+The following diagram illustrates layers of ob-operator and the relationship among the custom resources.
+
+![ob-operator architecture](/img/ob-operator-arch.png)
 
 ## Resource Manager
 
@@ -66,4 +76,4 @@ To address this issue, ob-operator adopts task flow mechanism and a global task
 
 The relationship among the control loop, resource manager, and task manager is depicted in the following figure.
 
-![The relationship among the control loop, resource manager, and task manager](/img/ob-operator-arch.png)
+![The relationship among the control loop, resource manager, and task manager](/img/ob-operator-task-manager-arch.png)