Skip to content

Commit

Permalink
Update manifests for releasing 2.1.1 (#143)
Browse files Browse the repository at this point in the history
* chore(verion): update verison from 2.1.0 to 2.1.1 for releasing
* chore: specify refered port with name in ocp.yaml
  • Loading branch information
powerfooI authored Dec 20, 2023
1 parent 39a218f commit 6c7c9a7
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 24 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.1.0
VERSION ?= 2.1.1
# 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.
Expand Down
6 changes: 3 additions & 3 deletions README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ob-operator 是满足 Kubernetes Operator 扩展范式的自动化工具,可

* 稳定版本
```shell
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.0_release/deploy/operator.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.1_release/deploy/operator.yaml
```

* 开发版本
Expand All @@ -34,7 +34,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.0
helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.1
```

#### 验证部署结果
Expand Down Expand Up @@ -63,7 +63,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.0_release/example/quickstart/obcluster.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.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 @@ -24,7 +24,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.0_release/deploy/operator.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.1_release/deploy/operator.yaml
```

* Development
Expand All @@ -38,7 +38,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.0
helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.1
```

#### Verify deployment
Expand Down Expand Up @@ -67,7 +67,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.0_release/example/quickstart/obcluster.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.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.1.0
appVersion: 2.1.1
description: A Helm chart for OB-Operator
name: ob-operator
type: application
version: 2.1.0
version: 2.1.1
2 changes: 1 addition & 1 deletion charts/ob-operator/templates/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12705,7 +12705,7 @@ spec:
env:
- name: TELEMETRY_REPORT_HOST
value: https://openwebapi.oceanbase.com
image: oceanbase/ob-operator:2.1.0
image: oceanbase/ob-operator:2.1.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: oceanbase/ob-operator
newTag: 2.1.0
newTag: 2.1.1
8 changes: 2 additions & 6 deletions deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12745,17 +12745,13 @@ spec:
- --metrics-bind-address=127.0.0.1:8080
- --leader-elect
- --manager-namespace=oceanbase-system
- --log-verbosity=2
- --log-verbosity=0
command:
- /manager
env:
- name: TELEMETRY_DEBUG
value: "true"
- name: DISABLE_TELEMETRY
value: "true"
- name: TELEMETRY_REPORT_HOST
value: https://openwebapi.oceanbase.com
image: oceanbase/ob-operator:2.1.0
image: oceanbase/ob-operator:2.1.1
livenessProbe:
httpGet:
path: /healthz
Expand Down
6 changes: 3 additions & 3 deletions docs/en_US/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.0
helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.1
```

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.0`.
* version: ob-operator version number. It is recommended to use the latest version `2.1.1`.

## 2.2 Deploying with Configuration Files

* Stable
```shell
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.0_release/deploy/operator.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.1_release/deploy/operator.yaml
```
* Development
```shell
Expand Down
6 changes: 3 additions & 3 deletions docs/zh_CN/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.0
helm install ob-operator ob-operator/ob-operator --namespace=oceanbase-system --create-namespace --version=2.1.1
```

参数说明:

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

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

## 2.2 使用配置文件部署

* Stable
```shell
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.0_release/deploy/operator.yaml
kubectl apply -f https://raw.githubusercontent.com/oceanbase/ob-operator/2.1.1_release/deploy/operator.yaml
```
* Development
```shell
Expand Down
2 changes: 1 addition & 1 deletion example/webapp/ocp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
- name: OCP_METADB_HOST
value: $(SVC_OBPROXY_SERVICE_HOST)
- name: OCP_METADB_PORT
value: $(SVC_OBPROXY_SERVICE_PORT)
value: $(SVC_OBPROXY_SERVICE_PORT_SQL)
- name: OCP_METADB_USER
value: root@metatenant#metadb
- name: OCP_METADB_PASSWORD
Expand Down

0 comments on commit 6c7c9a7

Please sign in to comment.