more updates for cloudbank v4 (#926)

markxnelson · andytael · web-flow · commit 74d023359c83 · 2024-08-30T15:10:51.000-04:00
* clarify free tier vs big/small
* Remove parse images
* spelling &amp; linting
* README update and SB 3.3.3

---------

Signed-off-by: Mark Nelson &lt;mark.x.nelson@oracle.com&gt;
Co-authored-by: Andy Tael &lt;andy.tael@yahoo.com&gt;
diff --git a/cloudbank-v4/README.md b/cloudbank-v4/README.md
@@ -1,8 +1,8 @@
-# CloudBank Version 3.2
+# CloudBank Version 4 - 8/30/24
 
 **NOTE:** This document and application is WIP.
 
-To run Cloud Bank you need OBaaS version 1.2.0 [Oracle Backend for Spring Boot and Microservices](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/138899911) and Java 21 installed.
+To run Cloud Bank you need OBaaS version 1.3.0 [Oracle Backend for Spring Boot and Microservices](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/138899911) and Java 21 installed.
 
 ## Build CloudBank
 
@@ -12,10 +12,10 @@ To run Cloud Bank you need OBaaS version 1.2.0 [Oracle Backend for Spring Boot a
    git clone https://github.com/oracle/microservices-datadriven.git
    ```
 
-1. Got to the `CloudBank-v32` directory
+1. Got to the `cloudBank-v4` directory
 
    ```shell
-   cd microservices-datadriven/cloudbank-v32
+   cd microservices-datadriven/cloudbank-v4
    ```
 
 1. Build CloudBank
@@ -40,8 +40,8 @@ To run Cloud Bank you need OBaaS version 1.2.0 [Oracle Backend for Spring Boot a
    [INFO] ------------------------------------------------------------------------
    [INFO] BUILD SUCCESS
    [INFO] ------------------------------------------------------------------------
-   [INFO] Total time:  10.160 s
-   [INFO] Finished at: 2024-01-12T10:41:10-06:00
+   [INFO] Total time:  9.437 s
+   [INFO] Finished at: 2024-08-30T10:57:14-05:00]
    [INFO] ------------------------------------------------------------------------
    ```
 
@@ -67,8 +67,8 @@ To run Cloud Bank you need OBaaS version 1.2.0 [Oracle Backend for Spring Boot a
     \_/ |_) (_| (_| __)   \_ |_ _|_
     ========================================================================================
     Application Name: Oracle Backend Platform :: Command Line Interface
-    Application Version: (1.1.1)
-    :: Spring Boot (v3.2.1) ::
+    Application Version: (1.3.0)
+    :: Spring Boot (v3.3.3) ::
     Ask for help:
         - Slack: https://oracledevs.slack.com/archives/C03ALDSV272
         - email: obaas_ww@oracle.com
@@ -84,7 +84,7 @@ To run Cloud Bank you need OBaaS version 1.2.0 [Oracle Backend for Spring Boot a
 CloudBank can be deployed using the `--script` command in `oractl`. CloudBank will be deployed in the namespace `application`. You are going to be asked for passwords when the `bind` command executes.
 
 ```text
-oractl:>script --file deploy-cmds/deploy-cb.txt
+oractl:>script --file deploy-cmds/deploy-cb-java21.txt
 ```
 
 The output should look similar to this:
diff --git a/cloudbank-v4/pom.xml b/cloudbank-v4/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.2</version>
+        <version>3.3.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
diff --git a/docs-source/cloudbank/content/cleanup/uninstall-local.md b/docs-source/cloudbank/content/cleanup/uninstall-local.md
@@ -6,8 +6,6 @@ weight = 2
 
 > **Note:** These steps apply only if you chose the option to install in a local container.
 
-
-
 1. Stop the local container using this command:
 
    ```bash
@@ -21,4 +19,3 @@ weight = 2
    ```bash
    docker rm obaas
    ```
-
diff --git a/docs-source/cloudbank/content/cleanup/uninstall-mp.md b/docs-source/cloudbank/content/cleanup/uninstall-mp.md
@@ -31,4 +31,3 @@ If the Terraform Destroy job fails, re-run the Destroy job again after a few min
 Even after the Destroy job has finished there will be one resource left in the tenancy/compartment and that is an OCI Vault. The Vault is on `PENDING DELETION` mode.
 
    ![OCI Vault](../images/vault.png " ")
-
diff --git a/docs-source/cloudbank/content/provision/images/obaas-parse-application.png b/docs-source/cloudbank/content/provision/images/obaas-parse-application.png
diff --git a/docs-source/cloudbank/content/provision/images/obaas-parse-dashboard.png b/docs-source/cloudbank/content/provision/images/obaas-parse-dashboard.png
diff --git a/docs-source/cloudbank/content/provision/images/obaas-stack-with-parse.png b/docs-source/cloudbank/content/provision/images/obaas-stack-with-parse.png
diff --git a/docs-source/cloudbank/content/provision/install-free-trial.md b/docs-source/cloudbank/content/provision/install-free-trial.md
@@ -8,6 +8,8 @@ This option allows you to run Oracle Backend for Spring Boot and Microservices i
 
    > **Note:** You only need to choose one of the three deployment options - local, OCI Free Tier or OCI Marketplace.
 
+You can also use this approach in any regular commercial Oracle Cloud Tenancy - just skip the first step and start at step 2!
+
 1. Get an Oracle Cloud Free Tier account
 
    If you do not already have one, you can obtain an Oracle Cloud Free Tier account as follows:
diff --git a/docs-source/cloudbank/content/provision/install-local.md b/docs-source/cloudbank/content/provision/install-local.md
@@ -7,15 +7,15 @@ weight = 2
 
 This option allows you to run Oracle Backend for Spring Boot and Microservices in a containerized
 environment on your local machine.  This option is recommended if you do have enough
-free capacity on your local machine to run the environment, a minimum of 64GB RAM and 80GB free disk are recommneded.
-This option provides an environment with adequeate resources for development and testing, but
+free capacity on your local machine to run the environment, a minimum of 64GB RAM and 80GB free disk are recommended.
+This option provides an environment with adequate resources for development and testing, but
 is not suitable for a production-sized deployment or performance testing.
 
    > **Note:** You only need to choose one of the three deployment options - local, OCI Free Tier or OCI Marketplace.
 
 1. Prerequisites
 
-   The following prerequisites are required to run the local environment: 
+   The following prerequisites are required to run the local environment:
 
    * A container runtime environment such as Docker Desktop, Rancher Desktop or Podman Desktop.
    * The ability to run a BASH script, or to read one and run equivalent commands in your environment.
@@ -38,12 +38,12 @@ is not suitable for a production-sized deployment or performance testing.
 1. Start the environment
 
    * Run the provided script to start the environment, including a Kubernetes cluster in a container (using k3s), Oracle Backend
-     for Spring Boot and Microservices and an Oracle Database instance inside that cluster. 
+     for Spring Boot and Microservices and an Oracle Database instance inside that cluster.
 
      ```bash
      ./obaas.sh
      ```  
-     
+
    * It will take approximately six to ten minutes (depending on the size of your machine) for all of the containers
      to reach ready/running state. You can watch the progress using this command:
 
@@ -53,10 +53,9 @@ is not suitable for a production-sized deployment or performance testing.
 
      > **Note:** You will need to provide the `KUBECONFIG` variable as shown, or export it in your shell, each time you wish to run a `kubectl` command to access the cluster.
 
-     When the environment is fully started, the output will appear similar to this: 
-
-     ![Completed startup](../images/install-free-tier-2.png " ")     
+     When the environment is fully started, the output will appear similar to this:
 
+     ![Completed startup](../images/install-free-tier-2.png " ")
 
 1. Verify access to web user interfaces
 
@@ -71,4 +70,4 @@ is not suitable for a production-sized deployment or performance testing.
 
    * The Spring Operations Center main dashboard will appear similar to this:
 
-     ![Spring Operations Center](../images/install-free-tier-5.png " ")     
+     ![Spring Operations Center](../images/install-free-tier-5.png " ")
diff --git a/docs-source/cloudbank/content/provision/install-mp.md b/docs-source/cloudbank/content/provision/install-mp.md
@@ -8,6 +8,10 @@ The Oracle Backend for Spring Boot and Microservices can be installed from OCI M
 
 > **Note:** You only need to choose one of the three deployment options - local, OCI Free Tier or OCI Marketplace.
 
+This option installs a "production-sized" environment which includes an Oracle Compute Engine for Kubernetes ("OKE")
+cluster and an Oracle Autonomous Database instance.  If you want to use a smaller, development/test-sized environment
+that only requires a single OCI Compute Instance, please use the "Free Tier" option instead.
+
 1. Access the Oracle Cloud Infrastructure Marketplace listing
 
     Open the [OCI Marketplace listing](https://cloudmarketplace.oracle.com/marketplace/en_US/listing/138899911), as shown in the image below:
diff --git a/docs-source/cloudbank/content/provision/intro.md b/docs-source/cloudbank/content/provision/intro.md
@@ -16,29 +16,28 @@ This module provides three options for running the environment:
 
 - **Locally in a container** - you will need a container platform like Docker Desktop, Rancher Desktop, Podman Desktop or similar.
   This option is recommended only if you have at least 64GB of RAM.  With less memory this option will probably be too slow.
-- In a **compute instance in an Oracle Cloud Free Tier** account.  You can sign up for an [Oracle Cloud Free Tier account here](https://signup.cloud.oracle.com/).
-  This account will include enough free credits to run CloudBank.
-- In a commercial **Oracle Cloud tenancy**.  If you have a commercial tenancy with sufficient capacity and
-  privileges, you can run the full production-sized installation.  This can be installed from the OCI Marketplace
-  using the instructions in Module 1.  Check the instructions for a more detailed list of requirements.
+- In a single compute instance in either an **Oracle Cloud Free Tier** account or any commercial OCI Cloud tenancy.  You can sign up for an [Oracle Cloud Free Tier account here](https://signup.cloud.oracle.com/).  This account will include enough free credits to run CloudBank. You can also use this option to run a lightweight, single compute instance environment in any Oracle Cloud tenancy.
+- The full production-sized installation from OCI Marketplace in a commercial **Oracle Cloud tenancy**.  If you have a commercial
+  tenancy with sufficient capacity and privileges, you can run the full production-sized installation.  This can be installed from
+  the OCI Marketplace using the instructions in Module 1.  Check the instructions for a more detailed list of requirements.
 
 Regardless of which option you choose, the remainder of the modules will be virtually identical.  
 
 ### Objectives
 
 In this lab, you will:
 
-* Provision an instance of Oracle Backend for Spring Boot and Microservices, either locally or in the cloud.
+- Provision an instance of Oracle Backend for Spring Boot and Microservices, either locally or in the cloud.
 
 ### Prerequisites
 
 This module assumes you have either:
 
-* An Oracle Cloud account in a tenancy with sufficient quota and privileges to create:
-  * An OCI Container Engine for Kubernetes cluster, plus a node pool with three worker nodes
-  * A VCN with at least two public IP’s available
-  * A public load balancer
-  * An Oracle Autonomous Database - Shared instance
-  * At least one free OCI Auth Token (note that the maximum is two per user), or
-* An Oracle Cloud Free Tier account, or
-* A local machine with enough memory (64GB recommneded) to run the environment locally.
+- An Oracle Cloud account in a tenancy with sufficient quota and privileges to create:
+  - An OCI Container Engine for Kubernetes cluster, plus a node pool with three worker nodes
+  - A VCN with at least two public IP’s available
+  - A public load balancer
+  - An Oracle Autonomous Database - Shared instance
+  - At least one free OCI Auth Token (note that the maximum is two per user), or
+- An Oracle Cloud Free Tier account, or
+- A local machine with enough memory (64GB recommended) to run the environment locally.
diff --git a/docs-source/cloudbank/content/springai/_index.md b/docs-source/cloudbank/content/springai/_index.md
@@ -4,8 +4,4 @@ title = "CloudBank AI Assistant"
 weight = 6
 +++
 
-This modules introduces [Spring AI](https://github.com/spring-projects/spring-ai)
-and explores how it can be used to build a CloudBank AI Assistant (chatbot) that will
-allow users to interact with CloudBank using a chat-based interface.
-In this module, you will learn about Retrieval Augmented Generation, Vector
-Database and AI Agents.
+This modules introduces [Spring AI](https://github.com/spring-projects/spring-ai) and explores how it can be used to build a CloudBank AI Assistant (chatbot) that will allow users to interact with CloudBank using a chat-based interface. In this module, you will learn about Retrieval Augmented Generation, Vector Database and AI Agents.

Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,3 @@ If the Terraform Destroy job fails, re-run the Destroy job again after a few min`
`31`	`31`	Even after the Destroy job has finished there will be one resource left in the tenancy/compartment and that is an OCI Vault. The Vault is on `PENDING DELETION` mode.
`32`	`32`
`33`	`33`	`![OCI Vault](../images/vault.png " ")`
`34`		`-`