Skip to content

Commit 0b2fb76

Browse files
authored
Documentation update (#1097)
* Documentation update Signed-off-by: Andy Tael <[email protected]>
1 parent 626543b commit 0b2fb76

File tree

4 files changed

+20
-25
lines changed

4 files changed

+20
-25
lines changed

docs-source/site/docs/setup/database.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,11 @@ You must edit the **values.yaml** file as follows:
1616

1717
- If you are using a private repository, you must update each **image** entry to point to your private repository instead of the public repositories.
1818

19-
- You must update the values in the **database.oci_config** section as follows:
20-
21-
- The **oke** setting must be **false**. Setting this to true is not supported in 2.0.0-M3.
22-
23-
- Supply your **tenancy**, **user** ocid, **fingerprint** and **region**. These must match the details you provided when you created the OCI configuration secret earlier. This information can be found in the OCI configuration file.
24-
2519
- (Optional) If you want to install any components in this chart into their own separate namespace, you can override the global namespace by setting a value in the **namespace** property inside the section for that component.
2620

2721
**Important note**: Please pause to double check all of the values are correct. If there are any errors here, the database provisioning will fail.
2822

29-
Install the Helm chart using the following command:
23+
Install the Helm chart using the following command (The `--debug` flag is optional and enables verbose output from Helm):
3024

3125
```bash
3226
helm --debug install obaas-db --set global.obaasName="obaas-dev" --set global.targetNamespace="obaas-dev" ./
@@ -54,16 +48,16 @@ If you overrode the namespace for this component, you will see a new namespace c
5448

5549
![DB Operator pods](media/image6.png)
5650

57-
**Note**: If you are installing multiple OBaaS instances in your cluster, each one MUST have a different release name, `obaasName` and `targetNamespace`. For example:
51+
**Note**: If you are installing multiple OBaaS instances in your cluster, each one MUST have a different release name, `obaasName` and `targetNamespace`. For example (The `--debug` flag is optional and enables verbose output from Helm):
5852

5953
For obaas-dev:
6054

6155
```bash
62-
helm install obaas-db --set global.obaasName="obaas-dev" --set global.targetNamespace="obaas-dev" ./
56+
helm --debug install obaas-db --set global.obaasName="obaas-dev" --set global.targetNamespace="obaas-dev" ./
6357
```
6458

6559
For obaas-prod:
6660

6761
```bash
68-
helm install obaas-prod-db --set global.obaasName="obaas-prod" --set global.targetNamespace="obaas-prod" ./
62+
helm --debug install obaas-prod-db --set global.obaasName="obaas-prod" --set global.targetNamespace="obaas-prod" ./
6963
```

docs-source/site/docs/setup/obaas.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,14 @@ You must edit the **values.yaml** file as follows:
2020

2121
- (Optional) If you want to install any components in this chart into their own separate namespace, you can override the global namespace by setting a value in the **namespace** property inside the section for that component.
2222

23-
- You must provide the OCID of your ADB-S instance in the setting **database.oci_db.ocid.**
24-
25-
- You must update the values in the **database.oci_config** section as follows:
26-
23+
- You must provide the OCID of your ADB-S instance in the setting **database.oci_db.ocid**
24+
- You must update the values in the **database.oci_config** the section as follows:
2725
- The **oke** setting must be **false**. Setting this to true is not supported in 2.0.0-M3.
28-
2926
- Supply your **tenancy**, **user** **ocid**, **fingerprint** and **region**. These must match the details you provided when you created the OCI configuration secret earlier.
3027

3128
**Important note**: Please pause to double check all of the values are correct. If there are any errors here, the OBaaS provisioning will fail.
3229

33-
Install the Helm chart using the following command:
30+
Install the Helm chart using the following command (The `--debug` flag is optional and enables verbose output from Helm):
3431

3532
```bash
3633
helm --debug install obaas --set global.obaasName="obaas-dev" --set global.targetNamespace="obaas-dev" ./
@@ -92,17 +89,18 @@ And many new pods. Note that these will take about 5 minutes for them all to get
9289
kubectl get pod -A
9390
```
9491

95-
**Note**: If you are installing multiple OBaaS instances in your cluster, each one MUST have a different release name, `obaasName` and `targetNamespace`. For example:
92+
**Note**: If you are installing multiple OBaaS instances in your cluster, each one MUST have a different release name, `obaasName` and `targetNamespace`. For example (The `--debug` flag is optional and enables verbose output from Helm):
9693

9794
For obaas-dev:
9895

9996
```bash
100-
helm install obaas --set global.obaasName="obaas-dev" --set global.targetNamespace="obaas-dev" ./
97+
helm --debug install obaas --set global.obaasName="obaas-dev" --set global.targetNamespace="obaas-dev" ./
98+
```
10199

102100
For obaas-prod:
103101

104102
```bash
105-
helm install obaas-prod --set global.obaasName="obaas-prod" --set global.targetNamespace="obaas-prod" ./
103+
helm --debug install obaas --set global.obaasName="obaas-prod" --set global targetNamespace="obaas-prod" ./
106104
```
107105

108106
**Note**: You MUST set different host names and/or ports for the APISIX ingress if you choose to install APISIX in both instances.

docs-source/site/docs/setup/observability.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ You must edit the **values.yaml** file as follows:
2626
by setting a value in the **namespace** property inside the section
2727
for that component.
2828

29-
Install the Helm chart using the following command:
29+
Install the Helm chart using the following command (The `--debug` flag is optional and enables verbose output from Helm):
3030

3131
```bash
32-
helm install obaas-observability --set global.obaasName="obaas-dev"
32+
helm --debug install obaas-observability --set global.obaasName="obaas-dev"
3333
```
3434

3535
```log
@@ -63,13 +63,16 @@ kubectl get pods --n observability # or whatever namespace name you chose
6363

6464
Please wait for all of the pods to be ready before continuing to the next step.
6565

66-
**Note**: If you are installing multiple OBaaS instances in your cluster, each one MUST have a different release name, `obaasName` and `targetNamespace`. For example:
66+
**Note**: If you are installing multiple OBaaS instances in your cluster, each one MUST have a different release name, `obaasName` and `targetNamespace`. For example (The `--debug` flag is optional and enables verbose output from Helm):
67+
68+
For obaas-dev:
6769

6870
```bash
69-
helm install obaas --set global.obaasName="obaas-dev" --set global.targetNamespace="obaas-dev" ./
71+
helm --debug install obaas-observability --set global.obaasName="obaas-dev" --set global.targetNamespace="obaas-dev" ./
72+
```
7073

7174
For obaas-prod:
7275

7376
```bash
74-
helm install obaas-prod --set global.obaasName="obaas-prod" --set global.targetNamespace="obaas-prod" ./
77+
helm --debug install obaas-observability --set global.obaasName="obaas-prod" --set global.targetNamespace="obaas-prod" ./
7578
```

docs-source/site/docs/setup/prereq-chart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ You must edit the **values.yaml** file as follows:
3131

3232
Choose a name for this OBaaS installation. In this document, we use **obaas-dev** as the name. Please note that the **targetNamespace** should match the namespace you created in the previous step, and that this namespace must already exist.
3333

34-
Install the Helm chart using the following command:
34+
Install the Helm chart using the following command (The `--debug` flag is optional and enables verbose output from Helm):
3535

3636
```bash
3737
helm --debug install obaas-prereqs ./

0 commit comments

Comments
 (0)