Skip to content

Commit

Permalink
bump ob-operator version to 2.3.1 (#649)
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-sun-star authored Nov 28, 2024
1 parent 1f2d1ed commit da664ee
Show file tree
Hide file tree
Showing 26 changed files with 78 additions and 104 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 3 additions & 3 deletions README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) 提供, 需要提前进行安装并确保其存储目的地有足够大的磁盘空间。如果您计划在生产环境部署,推荐使用其他的存储解决方案。我们在[存储兼容性](#存储兼容性)一节提供了我们测试过的存储兼容性结果。
Expand All @@ -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
```

- 开发版本
Expand Down Expand Up @@ -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 之后表示集群创建和初始化成功:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions charts/ob-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
14 changes: 11 additions & 3 deletions charts/ob-operator/templates/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/oceanbase/ob-operator
newTag: 2.3.0
newTag: 2.3.1
2 changes: 1 addition & 1 deletion deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docsite/docs/developer/deploy-locally.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ Tips: Perform `minikube dashboard` to open kubernetes dashboard, everything in t
ob-operator depends on `cert-manager` to enable TLS functionalities, so we should install it first.

```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
```

### 4. Install ob-operator

For robustness, default memory limit of ob-operator container is set to `1Gi` which is too large for us developing locally. We recommend fetching the manifests to local and configure it. wget tool could be useful here, while opening the URL and copying the contents to local file is more straight.

https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/deploy/operator.yaml
https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/deploy/operator.yaml

Search the pattern `/manager`, find the target container, configure the memory limit to `400Mi` and cpu limit to `400m`.

Expand Down Expand Up @@ -204,4 +204,4 @@ Connect to the tenant,
```shell
PODNAME=$(kubectl get pods -l ref-obcluster=test -o jsonpath='{.items[*].metadata.name}')
kubectl exec -it pods/$PODNAME -- mysql -h127.0.0.1 -P2881 -uroot@t1
```
```
4 changes: 2 additions & 2 deletions docsite/docs/developer/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ 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.3.0`.
* version: ob-operator version number. It is recommended to use the latest version `2.3.1`.

## 2.2 Deploying with Configuration Files

* 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
```shell
Expand Down
4 changes: 2 additions & 2 deletions docsite/docs/manual/200.quick-start-of-ob-operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Run the following command to deploy ob-operator in the Kubernetes cluster:
- Deploy the stable version of ob-operator

```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
```

- Deploy the developing version of ob-operator
Expand Down Expand Up @@ -61,7 +61,7 @@ Perform the following steps to deploy an OceanBase cluster in the Kubernetes clu
Run the following command to deploy an OceanBase cluster in the Kubernetes cluster:

```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
```

In general, it takes about 2 minutes to create a cluster. Run the following command to check the cluster status:
Expand Down
2 changes: 1 addition & 1 deletion docsite/docs/manual/300.deploy-ob-operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ You can deploy ob-operator by using the configuration file for the stable or dev
* Deploy the stable version of ob-operator

```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
```

* Deploy the developing version of ob-operator
Expand Down
2 changes: 1 addition & 1 deletion docsite/docs/manual/400.ob-operator-upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ If you upgrade ob-operator by using configuration files, you only need to reappl
- Deploy the stable version of ob-operator

```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
```

- Deploy the developing version of ob-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Before you create a tenant, make sure the following conditions are met:

## Create a tenant by using the configuration file

You can create a tenant by using the configuration file of the tenant. For more information about the configuration file, visit [GitHub](https://github.com/oceanbase/ob-operator/blob/2.3.0_release/example/tenant/tenant.yaml).
You can create a tenant by using the configuration file of the tenant. For more information about the configuration file, visit [GitHub](https://github.com/oceanbase/ob-operator/blob/2.3.1_release/example/tenant/tenant.yaml).

Run the following command to create a tenant. This command creates an OceanBase Database tenant with custom resources in the current Kubernetes cluster.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This topic describes how to use ob-operator to delete a tenant from a Kubernetes

## Procedure

You can delete the specified tenant resources from the cluster by using the configuration file `tenant.yaml`. For more information about the configuration file, visit [GitHub](https://github.com/oceanbase/ob-operator/blob/2.3.0_release/example/tenant/tenant.yaml).
You can delete the specified tenant resources from the cluster by using the configuration file `tenant.yaml`. For more information about the configuration file, visit [GitHub](https://github.com/oceanbase/ob-operator/blob/2.3.1_release/example/tenant/tenant.yaml).

Run the following command to delete a tenant. This command deletes an OceanBase Database tenant with custom resources in the current Kubernetes cluster.

Expand Down
20 changes: 10 additions & 10 deletions docsite/docs/manual/900.appendix/100.example.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ In this example, the following components are deployed:
Create a namespace:

```shell
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/example/webapp/namespace.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/example/webapp/namespace.yaml
```

View the created namespace:
Expand All @@ -46,7 +46,7 @@ oceanbase Active 98s
Create secrets for the cluster and tenants:

```shell
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/example/webapp/secret.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/example/webapp/secret.yaml
```

View the created secrets:
Expand All @@ -73,7 +73,7 @@ ob-configserver allows you to register, store, and query metadata of the RootSer
Run the following command to deploy ob-configserver and create the corresponding service:

```shell
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/example/webapp/configserver.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/example/webapp/configserver.yaml
```

Check the pod status:
Expand Down Expand Up @@ -101,7 +101,7 @@ When you deploy an OceanBase cluster, add environment variables and set the syst
Deploy the OceanBase cluster:

```shell
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/example/webapp/obcluster.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/example/webapp/obcluster.yaml
```

Run the following command to query the status of the OceanBase cluster until the status becomes `running`:
Expand All @@ -121,7 +121,7 @@ You can start ODP by using ob-configserver or specifying the RS list. To maximiz
Run the following command to deploy ODP and create the ODP service:

```shell
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/example/webapp/obproxy.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/example/webapp/obproxy.yaml
```

When you query the pod status of ODP, you can see two ODP pods.
Expand Down Expand Up @@ -165,7 +165,7 @@ You can create a dedicated tenant for each type of business for better resource
Run the following command to create a tenant:

```shell
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/example/webapp/tenant.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/example/webapp/tenant.yaml
```

Run the following command to query the status of the tenant until the status becomes `running`:
Expand Down Expand Up @@ -201,7 +201,7 @@ create database dev;
Run the following command to deploy the application:

```shell
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/example/webapp/oceanbase-todo.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/example/webapp/oceanbase-todo.yaml
```

After the deployment process is completed, run the following command to view the application status:
Expand Down Expand Up @@ -254,7 +254,7 @@ When you deploy the OceanBase cluster, an OBAgent sidecar container is created i
Run the following command to deploy Prometheus:

```shell
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/example/webapp/prometheus.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/example/webapp/prometheus.yaml
```

Run the following command to view the deployment status:
Expand All @@ -276,7 +276,7 @@ Grafana displays the metrics of OceanBase Database by using Prometheus as a data
Run the following command to deploy Grafana:

```shell
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/example/webapp/grafana.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/example/webapp/grafana.yaml
```

Run the following command to view the deployment status:
Expand All @@ -302,4 +302,4 @@ This topic describes how to deploy OceanBase Database and related components suc

## Note

You can find all configuration files used in this topic in the [webapp](https://github.com/oceanbase/ob-operator/tree/2.3.0_release/example/webapp) directory.
You can find all configuration files used in this topic in the [webapp](https://github.com/oceanbase/ob-operator/tree/2.3.1_release/example/webapp) directory.
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ Tips: Perform `minikube dashboard` to open kubernetes dashboard, everything in t
ob-operator depends on `cert-manager` to enable TLS functionalities, so we should install it first.

```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
```

### 4. Install ob-operator

For robustness, default memory limit of ob-operator container is set to `1Gi` which is too large for us developing locally. We recommend fetching the manifests to local and configure it. wget tool could be useful here, while opening the URL and copying the contents to local file is more straight.

https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.0_release/deploy/operator.yaml
https://raw.githubusercontent.com/oceanbase/ob-operator/2.3.1_release/deploy/operator.yaml

Search the pattern `/manager`, find the target container, configure the memory limit to `400Mi` and cpu limit to `400m`.

Expand Down Expand Up @@ -204,4 +204,4 @@ Connect to the tenant,
```shell
PODNAME=$(kubectl get pods -l ref-obcluster=test -o jsonpath='{.items[*].metadata.name}')
kubectl exec -it pods/$PODNAME -- mysql -h127.0.0.1 -P2881 -uroot@t1
```
```
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --

* namespace:命名空间,可自定义,一般建议使用 oceanbase-system。

* version:ob-operator 版本号,建议使用最新的版本 `2.3.0`
* version:ob-operator 版本号,建议使用最新的版本 `2.3.1`

## 2.2 使用配置文件部署

* 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
```shell
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sidebar_position: 2
- 稳定版本

```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
```

- 开发版本
Expand Down Expand Up @@ -61,7 +61,7 @@ oceanbase-controller-manager-86cfc8f7bf-4hfnj 2/2 Running 0 1m
使用以下命令在 Kubernetes 集群上部署 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 分钟。执行以下命令检查集群状态:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --
* 稳定版本

```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
```

* 开发版本
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sidebar_position: 4
- 稳定版本

```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
```

- 开发版本
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sidebar_position: 2

## 使用配置文件创建租户

通过应用租户配置文件创建租户。配置文件内容可参考 [GitHub](https://github.com/oceanbase/ob-operator/blob/2.3.0_release/example/tenant/tenant.yaml)
通过应用租户配置文件创建租户。配置文件内容可参考 [GitHub](https://github.com/oceanbase/ob-operator/blob/2.3.1_release/example/tenant/tenant.yaml)

创建租户的命令如下,该命令会在当前 Kubernetes 集群中创建一个 OBTenant 租户的资源。

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sidebar_position: 4

## 具体操作

通过配置文件 tenant.yaml 在集群中删除指定的租户资源。配置文件可参考 [GitHub](https://github.com/oceanbase/ob-operator/blob/2.3.0_release/example/tenant/tenant.yaml)
通过配置文件 tenant.yaml 在集群中删除指定的租户资源。配置文件可参考 [GitHub](https://github.com/oceanbase/ob-operator/blob/2.3.1_release/example/tenant/tenant.yaml)

删除租户的命令如下,该命令会在当前 Kubernetes 集群中删除对应租户的 OBTenant 资源。

Expand Down
Loading

0 comments on commit da664ee

Please sign in to comment.