Fix some problems for 2.1.2 release (oceanbase#156)

* fix oceanbase#155, if a server is being deleted, obzone will not count it as a working server * fix(manifests): modify version of dashboard to 0.1.0; rename image of dashboard to oceanbase-dashboard * chore(version): update version from 2.1.1 to 2.1.2
junli0411 · Jan 3, 2024 · 3fef52d · 3fef52d
1 parent dd5cb2a
commit 3fef52d
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 27 deletions.
diff --git a/.github/workflows/release-dashboard.yml b/.github/workflows/release-dashboard.yml
@@ -66,7 +66,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           file: ./distribution/dashboard/Dockerfile
           push: true
-          tags: ${{ vars.DOCKER_PUSH_BASE }}/dashboard:${{ steps.set_version_vars.outputs.version }}
+          tags: ${{ vars.DOCKER_PUSH_BASE }}/oceanbase-dashboard:${{ steps.set_version_vars.outputs.version }}
           build-args: |
             VERSION=${{ steps.set_version_vars.outputs.version }}
             COMMIT_HASH=${{ github.sha }}
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 include make/*
 
-VERSION ?= 2.1.1
+VERSION ?= 2.1.2
 # 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.

diff --git a/README-CN.md b/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.1_release/deploy/operator.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.2_release/deploy/operator.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.1_r
 * 稳定版本
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.1_release/deploy/operator.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.2_release/deploy/operator.yaml
 ```
 
 * 开发版本
@@ -44,7 +44,7 @@ Helm Chart 将 ob-operator 部署的命名空间进行了参数化，可在安
 
 ```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.1
+helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.2
 ```
 
 #### 验证部署结果
@@ -73,7 +73,7 @@ kubectl create secret generic operator-password --from-literal=password='operato
 通过以下命令即可在 K8s 集群中部署 OceanBase：
 
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.1_release/example/quickstart/obcluster.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.2_release/example/quickstart/obcluster.yaml
 ```
 
 一般初始化集群需要 2 分钟左右的时间，执行以下命令，查询集群状态，当集群状态变成 running 之后表示集群创建和初始化成功：

diff --git a/README.md b/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.1_release/deploy/cert-manager.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.2_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.1_release/deploy/operator.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.2_release/deploy/operator.yaml
 ```
 
 * Development
@@ -45,7 +45,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 install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.1
+helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.2
 ```
 
 #### Verify deployment
@@ -74,7 +74,7 @@ kubectl create secret generic operator-password --from-literal=password='operato
 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.1_release/example/quickstart/obcluster.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.2_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:

diff --git a/charts/ob-operator/Chart.yaml b/charts/ob-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 2.1.1
+appVersion: 2.1.2
 description: A Helm chart for OB-Operator
 name: ob-operator
 type: application
-version: 2.1.1
+version: 2.1.2
diff --git a/charts/ob-operator/templates/operator.yaml b/charts/ob-operator/templates/operator.yaml
@@ -12629,7 +12629,7 @@ spec:
         env:
         - name: TELEMETRY_REPORT_HOST
           value: https://openwebapi.oceanbase.com
-        image: oceanbase/ob-operator:2.1.1
+        image: oceanbase/ob-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/charts/oceanbase-cluster/templates/obcluster.yaml b/charts/oceanbase-cluster/templates/obcluster.yaml
@@ -10,7 +10,6 @@ metadata:
 spec:
   clusterName: {{ .Values.clusterName | default .Release.Name | quote }}
   clusterId: {{ .Values.clusterId | default 1 }}
-  standalone: {{ .Values.standalone | default false }}
   userSecrets:
   {{- range $key, $value := .Values.userSecrets }}
     {{ $key }}: {{ $value | quote }}

diff --git a/charts/oceanbase-cluster/values.yaml b/charts/oceanbase-cluster/values.yaml
@@ -6,8 +6,7 @@ obAgentVersion: 4.2.1-100000092023101717
 annotations: 
   # "oceanbase.oceanbase.com/independent-pvc-lifecycle": "true"
   # "oceanbase.oceanbase.com/single-pvc": "true"
-
-standalone: false
+  # "oceanbase.oceanbase.com/mode": "standalone"
 
 storageClass: local-path
 

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: oceanbase/ob-operator
-  newTag: 2.1.1
+  newTag: 2.1.2
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -12680,7 +12680,7 @@ spec:
         - --log-verbosity=0
         command:
         - /manager
-        image: oceanbase/ob-operator:2.1.1
+        image: oceanbase/ob-operator:2.1.2
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/distribution/dashboard/manifests/chart/Chart.yaml b/distribution/dashboard/manifests/chart/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0
+version: 0.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.0"
+appVersion: "0.1.0"
diff --git a/distribution/dashboard/manifests/chart/templates/bundle.yaml b/distribution/dashboard/manifests/chart/templates/bundle.yaml
@@ -19,7 +19,7 @@ spec:
       serviceAccountName: {{ .Release.Name }}-sa
       containers:
         - name: dashboard
-          image: oceanbasedev/oceanbase-dashboard:0.1.0
+          image: oceanbase/oceanbase-dashboard:{{ .Chart.AppVersion }}
           resources:
             requests:
               cpu: 100m

diff --git a/docs/en_US/deploy.md b/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.1
+helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.2
 ```
 
 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.1`.
+* version: ob-operator version number. It is recommended to use the latest version `2.1.2`.
 
 ## 2.2 Deploying with Configuration Files
 
 * Stable
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.1_release/deploy/operator.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.2_release/deploy/operator.yaml
 ```
 * Development
 ```shell

diff --git a/docs/zh_CN/deploy.md b/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.1
+helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.2
 ```
 
 参数说明：
 
 * namespace：命名空间，可自定义，一般建议使用 oceanbase-system。
 
-* version：ob-operator 版本号，建议使用最新的版本 `2.1.1`。
+* version：ob-operator 版本号，建议使用最新的版本 `2.1.2`。
 
 ## 2.2 使用配置文件部署
 
 * Stable
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.1_release/deploy/operator.yaml
+kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.2_release/deploy/operator.yaml
 ```
 * Development
 ```shell

diff --git a/example/obcluster/obcluster.yaml b/example/obcluster/obcluster.yaml
@@ -5,6 +5,8 @@ metadata:
   namespace: oceanbase
   # annotations:
   #   "oceanbase.oceanbase.com/independent-pvc-lifecycle": "true"
+  #   "oceanbase.oceanbase.com/single-pvc": "true"
+  #   "oceanbase.oceanbase.com/mode": "standalone"
 spec:
   clusterName: obcluster
   clusterId: 1

diff --git a/internal/resource/obzone/obzone_flow.go b/internal/resource/obzone/obzone_flow.go
@@ -14,6 +14,7 @@ package obzone
 
 import (
 	zonestatus "github.com/oceanbase/ob-operator/internal/const/status/obzone"
+	"github.com/oceanbase/ob-operator/pkg/task/const/strategy"
 	tasktypes "github.com/oceanbase/ob-operator/pkg/task/types"
 )
 
@@ -63,6 +64,9 @@ func DeleteOBServer() *tasktypes.TaskFlow {
 			Name:         fDeleteOBServer,
 			Tasks:        []tasktypes.TaskName{tDeleteOBServer, tWaitReplicaMatch},
 			TargetStatus: zonestatus.Running,
+			OnFailure: tasktypes.FailureRule{
+				Strategy: strategy.RetryFromCurrent,
+			},
 		},
 	}
 }

diff --git a/internal/resource/obzone/obzone_task.go b/internal/resource/obzone/obzone_task.go
@@ -167,6 +167,10 @@ func (m *OBZoneManager) DeleteOBServer() tasktypes.TaskError {
 	}
 	observerCount := 0
 	for _, observer := range observerList.Items {
+		// bugfix: if an observer is being deleted, it won't be deleted again or counted as a working observer
+		if observer.Status.Status == serverstatus.Deleting {
+			continue
+		}
 		if observer.Status.Status == serverstatus.Unrecoverable || observerCount >= m.OBZone.Spec.Topology.Replica {
 			m.Logger.Info("delete observer", "observer", observer)
 			err = m.Client.Delete(m.Ctx, &observer)