Merge from 2.2.0_release (#272)

Makefile

@@ -1,6 +1,6 @@
 include make/*
 
-VERSION ?= 2.1.2
+VERSION ?= 2.2.0
 # Image URL to use all building/pushing image targets
 IMG ?= 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.1.2_release/deploy/cert-manager.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.2.0_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.1.2_r
 * 稳定版本
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.2_release/deploy/operator.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.2.0_release/deploy/operator.yaml
 ```
 
 * 开发版本
@@ -45,7 +45,7 @@ Helm Chart 将 ob-operator 部署的命名空间进行了参数化，可在安
 ```shell
 helm repo add ob-operator https://oceanbase.github.io/ob-operator/
 helm repo update
-helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.2
+helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.2.0
 ```
 
 #### 使用 terraform
@@ -94,7 +94,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.1.2_release/example/quickstart/obcluster.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.2.0_release/example/quickstart/obcluster.yaml
 ```
 
 一般初始化集群需要 2 分钟左右的时间，执行以下命令，查询集群状态，当集群状态变成 running 之后表示集群创建和初始化成功：

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.1.2_release/deploy/cert-manager.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.2.0_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.
@@ -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.1.2_release/deploy/operator.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.2.0_release/deploy/operator.yaml
 ```
 
 * Development
@@ -46,7 +46,7 @@ Helm Chart parameterizes the namespace in which ob-operator is deployed, allowin
 ```shell
 helm repo add ob-operator https://oceanbase.github.io/ob-operator/
 helm repo update
-helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.2
+helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.2.0
 ```
 
 #### Using terraform
@@ -95,7 +95,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.1.2_release/example/quickstart/obcluster.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.2.0_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:

charts/ob-operator/Chart.yaml

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

charts/ob-operator/templates/operator.yaml

@@ -12713,7 +12713,7 @@ spec:
         - --log-verbosity=0
         command:
         - /manager
-        image: oceanbase/ob-operator:2.1.2
+        image: oceanbase/ob-operator:2.2.0
         livenessProbe:
           httpGet:
             path: /healthz

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: oceanbase/ob-operator
-  newTag: 2.1.2
+  newTag: 2.2.0

deploy/operator.yaml

@@ -12733,7 +12733,7 @@ spec:
         - --log-verbosity=0
         command:
         - /manager
-        image: oceanbase/ob-operator:2.1.2
+        image: oceanbase/ob-operator:2.2.0
         livenessProbe:
           httpGet:
             path: /healthz

docs/en_US/deploy.md

@@ -14,20 +14,20 @@ ob-operator supports deployment using Helm. Before deploying ob-operator with th
 
 ```shell
 helm repo add ob-operator https://oceanbase.github.io/ob-operator/
-helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.2
+helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.2.0
 ```
 
 Parameters:
 
 * namespace: Namespace, can be customized. It is recommended to use "oceanbase-system" as the namespace.
 
-* version: ob-operator version number. It is recommended to use the latest version `2.1.2`.
+* version: ob-operator version number. It is recommended to use the latest version `2.2.0`.
 
 ## 2.2 Deploying with Configuration Files
 
 * Stable
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.2_release/deploy/operator.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.2.0_release/deploy/operator.yaml
 ```
 * Development
 ```shell

docs/zh_CN/deploy.md

@@ -12,20 +12,20 @@ ob-operator 支持通过 Helm 进行部署，在使用 Helm 命令部署 ob-oper
 
 ```shell
 helm repo add ob-operator https://oceanbase.github.io/ob-operator/
-helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.2
+helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.2.0
 ```
 
 参数说明：
 
 * namespace：命名空间，可自定义，一般建议使用 oceanbase-system。
 
-* version：ob-operator 版本号，建议使用最新的版本 `2.1.2`。
+* version：ob-operator 版本号，建议使用最新的版本 `2.2.0`。
 
 ## 2.2 使用配置文件部署
 
 * Stable
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.2_release/deploy/operator.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.2.0_release/deploy/operator.yaml
 ```
 * Development
 ```shell

internal/dashboard/middleware/authentication.go

@@ -62,7 +62,7 @@ func LoginRequired() gin.HandlerFunc {
 			session.Options(sessions.Options{Path: "/", MaxAge: -1}) // this sets the cookie with a MaxAge of 0
 			err := session.Save()
 			if err != nil {
-				log.Errorf("failed to save session: %v", err)
+				log.Errorf("Failed to save session: %v", err)
 				c.AbortWithStatusJSON(500, gin.H{
 					"message": "failed to save session",
 				})
@@ -88,7 +88,7 @@ func RefreshExpiration() gin.HandlerFunc {
 		session.Set("expiration", expiration.Unix())
 		err := session.Save()
 		if err != nil {
-			log.Errorf("failed to save session: %v", err)
+			log.Errorf("Failed to save session: %v", err)
 			c.AbortWithStatusJSON(500, gin.H{
 				"message": "failed to save session",
 			})

internal/resource/observer/observer_task.go

@@ -97,7 +97,7 @@ func WaitOBClusterBootstrapped(m *OBServerManager) tasktypes.TaskError {
 }
 
 func CreateOBPod(m *OBServerManager) tasktypes.TaskError {
-	m.Logger.V(oceanbaseconst.LogLevelDebug).Info("create observer pod")
+	m.Logger.V(oceanbaseconst.LogLevelDebug).Info("Create observer pod")
 	obcluster, err := m.getOBCluster()
 	if err != nil {
 		return errors.Wrap(err, "Get obcluster from K8s")
@@ -218,7 +218,7 @@ func CreateOBPVC(m *OBServerManager) tasktypes.TaskError {
 }
 
 func DeleteOBServerInCluster(m *OBServerManager) tasktypes.TaskError {
-	m.Logger.V(oceanbaseconst.LogLevelDebug).Info("delete observer in cluster")
+	m.Logger.V(oceanbaseconst.LogLevelDebug).Info("Delete observer in cluster")
 	operationManager, err := m.getOceanbaseOperationManager()
 	if err != nil {
 		return errors.Wrapf(err, "Get oceanbase operation manager failed")
@@ -297,7 +297,7 @@ func WaitOBServerPodReady(m *OBServerManager) tasktypes.TaskError {
 			}
 		}
 		if observerPodRestarted {
-			m.Logger.Info("observer pod restarted")
+			m.Logger.Info("OBServer pod restarted")
 			break
 		}
 		time.Sleep(time.Second)
@@ -312,7 +312,7 @@ func WaitOBServerActiveInCluster(m *OBServerManager) tasktypes.TaskError {
 	if m.OBServer.SupportStaticIP() {
 		return nil
 	}
-	m.Logger.Info("wait observer active in cluster")
+	m.Logger.Info("Wait for observer to be active in cluster")
 	observerInfo := &model.ServerInfo{
 		Ip:   m.OBServer.Status.GetConnectAddr(),
 		Port: oceanbaseconst.RpcPort,
@@ -347,7 +347,7 @@ func WaitOBServerDeletedInCluster(m *OBServerManager) tasktypes.TaskError {
 	if m.OBServer.SupportStaticIP() {
 		return nil
 	}
-	m.Logger.Info("wait observer deleted in cluster")
+	m.Logger.Info("Wait for observer to be deleted in cluster")
 	observerInfo := &model.ServerInfo{
 		Ip:   m.OBServer.Status.GetConnectAddr(),
 		Port: oceanbaseconst.RpcPort,

internal/resource/observer/utils.go

@@ -132,7 +132,7 @@ func (m *OBServerManager) setRecoveryStatus() {
 		m.Logger.Info("Current server can keep static ip address or the cluster runs as standalone, recover by recreating pod")
 		m.OBServer.Status.Status = serverstatus.Recover
 	} else {
-		m.Logger.Info("observer not recoverable, delete current observer and wait recreate")
+		m.Logger.Info("OBServer is not recoverable, delete current observer and wait recreate")
 		m.OBServer.Status.Status = serverstatus.Unrecoverable
 	}
 }
@@ -481,7 +481,7 @@ func (m *OBServerManager) createOBServerContainer(obcluster *v1alpha1.OBCluster)
 			svc, err := m.getSvc()
 			if err != nil {
 				if kubeerrors.IsNotFound(err) {
-					m.Logger.Info("svc not found")
+					m.Logger.Info("Svc not found")
 				} else {
 					m.Logger.Error(err, "Failed to get svc")
 				}

pkg/oceanbase-sdk/const/config/bootstrap.go

@@ -17,5 +17,5 @@ import (
 )
 
 const (
-	BootstrapTimeout = 600 * time.Second
+	BootstrapTimeout = 1800 * time.Second
 )

pkg/oceanbase-sdk/operation/tenant.go

@@ -280,14 +280,14 @@ func (m *OceanbaseOperationManager) WaitTenantLocalityChangeFinished(name string
 			m.Logger.Error(err, "Failed to get tenant info")
 		}
 		if tenant.PreviousLocality == "" {
-			m.Logger.V(oceanbaseconst.LogLevelTrace).Info("tenant locality change finished", "tenant name", name)
+			m.Logger.V(oceanbaseconst.LogLevelTrace).Info("Tenant locality change finished", "tenant name", name)
 			finished = true
 			break
 		}
 		time.Sleep(1 * time.Second)
 	}
 	if !finished {
-		return errors.Errorf("tenant %s locality change still not finished after %d seconds", name, timeoutSeconds)
+		return errors.Errorf("Tenant %s locality change still not finished after %d seconds", name, timeoutSeconds)
 	}
 	return nil
 }