Merge pull request #1126 from oracle/helm-db-updates

support for byo databases

Author: lake-of-dreams

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

@@ -20,10 +20,16 @@ You must edit the **values.yaml** file as follows:
 
 - (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.
 
-- You must provide the OCID of your ADB-S instance in the setting **database.oci_db.ocid**
-- You must update the values in the **database.oci_config** section as follows:
-  - The **oke** setting must be **false**. Setting this to true is not supported in 2.0.0-M4.
-  - Supply your **tenancy**, **user ocid**, **fingerprint**, and **region**. These must match the details you provided when you created the OCI configuration secret earlier.
+- (Optional) To use an existing Oracle database in your applications, set **database.enabled** to **true** and provide following configurations:
+  - If the database is an Oracle Autonomous Database in OCI and you want Oracle Database Operator to access and create **tns** and **wallet** secrets containing the connection information for the database:
+    - Provide **database.type** as **"ADB-S"**.
+    - You must provide the OCID of your ADB-S instance in the setting **database.oci_db.ocid**
+    - You must update the values in the **database.oci_config** section as follows:
+      - The **oke** setting must be **false**. Setting this to true is not supported in 2.0.0-M4.
+      - Supply your **tenancy**, **user ocid**, **fingerprint**, and **region**. These must match the details you provided when you created the OCI configuration secret earlier.
+  - If the database is not an Oracle Autonomous Database in OCI or you do not want Oracle Database Operator to create the **tns** secret containing the connection information for the database:
+    - Modify/Create the [Database Credentials Secret](./secrets.md#database-credentials-secret) to include the **dbhost** and **dbport** for the database instance.
+    - Leave **database.type** as blank.
 
 **Important note**: Please pause to double check all of the values are correct. If there are any errors here, the OBaaS provisioning will fail.
 

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

@@ -168,6 +168,19 @@ metadata:
 If you are planning to install multiple OBaaS instances, AND you want to use different databases, you need to create one of these secrets for EACH instance, and they must have different names.
 :::
 
+:::note
+If you want to use an existing Oracle Database in your applications which is not deployed as an Oracle Autonomous Database in OCI or you do not want Oracle Database Operator to create/sync the **tns** secret containing the connection information for the database, provide the **dbhost** and **dbport** for the database instance while creating the secret as follows:.
+```bash
+kubectl create secret generic admin-user-authn \
+  --from-literal=username=ADMIN \
+  --from-literal=password="Welcome-12345" \
+  --from-literal=service="demo1_tp" \
+  --from-literal=dbname="demo1" \
+  --from-literal=dbhost="demodb.demohost" \
+  --from-literal=dbport="1522"
+```  
+:::
+
 ### OCI Credentials Secret
 
 Run the provided script to generate the appropriate command for you from your OCI configuration. Note: You must have a working OCI CLI configured with access to your tenancy and the region where you want to install, on the machine where you run this command. The python script generated a command that you need to execute. to create the key.