WMS 11499 - split of Compute to Public/Private VM

oci-starter-lab/advanced/advanced.md

@@ -50,6 +50,14 @@ You can choose other Java VM to run your program:
         - These advantage come also with a long time to compile. So, it is better to first start first with JIT (JDK or GraalVM). Then to compile with GraalVM Native
         - [More info: see https://www.graalvm.org/22.0/reference-manual/native-image/](https://www.graalvm.org/22.0/reference-manual/native-image/)
 
+## Task 3 - Security 
+
+To enable login using OAuth / OpenID using your application, choose the Security / OpenID flag.
+
+It will add needed resources in your application to configure it:
+- an OCI Identity Domain Confidential App,
+- and login configuration for that Confidential App inside API Gateway.
+
 ## Task 4 - HTTPS = DNS + TLS
 
 It is nicer to have a website with a HTTPS protocol. Like https://www.ocistarter.com.

oci-starter-lab/container_instance/container_instance.md

@@ -97,7 +97,7 @@ During the build, Terraform will create:
     </copy>
     ```
     - Choose **Build**
-        ![Result](../compute/images/starter-starter-build.png)     
+        ![Result](../public_compute/images/starter-starter-build.png)     
     - It will build all and at the end you will see:
     ```
     <copy>
@@ -117,7 +117,7 @@ During the build, Terraform will create:
 
 ### Customize
 
-Please also check the  "Lab 6 - How to Customize" to see how to customize this sample to your needs
+Please also check the  "Lab 7 - How to Customize" to see how to customize this sample to your needs
 
 ### Cleanup
 

oci-starter-lab/function/function.md

@@ -107,7 +107,7 @@ Before to run the build. Notice that the build will create:
     </copy>
     ```
     - Choose **Build**
-        ![Result](../compute/images/starter-starter-build.png)     
+        ![Result](../public_compute/images/starter-starter-build.png)     
     - It will build all and at the end you will see:
     ```
     <copy>
@@ -126,7 +126,7 @@ Before to run the build. Notice that the build will create:
 ## Task 4: More info
 
 ### Customize
-Please also check the  "Lab 6 - How to Customize" to see how to customize this sample to your needs
+Please also check the  "Lab 7 - How to Customize" to see how to customize this sample to your needs
 
 ### Object Storage
 During the build, it will generate an Object Storage to store the HTML file.

oci-starter-lab/group/group.md

@@ -18,11 +18,17 @@ But when you enable the *Advanced* option, you have 3 choices for Group: *None /
 
 ## Architecture
 
-### Compute
+### Public Virtual Machine
 
-Here is the architecture of a group of applications sharing common resources with Compute
+Here is the architecture of a group of applications sharing common resources with Public Virtual Machine
 
-![Group Compute](images/architecture_common_compute.png =80%x*)
+![Group Public Compute](images/architecture_common_public_compute.png =80%x*)
+
+### Private Virtual Machine
+
+Here is the architecture of a group of applications sharing common resources with Private Virtual Machine
+
+![Group Private Compute](images/architecture_common_public_compute.png =80%x*)
 
 ### Kubernetes
 
@@ -56,10 +62,12 @@ Let's create a group and a first application (micro-service).
    ![Group App1](images/starter-group-app1.png =80%x*)
 7. Copy the command 
     ```
+    <copy>
     curl "https://www.ocistarter.com/app/zip?prefix=starter&group_name=dev&group_common=atp,oke&deploy=kubernetes&ui=html&language=java&database=atp" --output dev.zip
     unzip dev.zip
     cd dev
     cat README.md
+    </copy>
     ```
 8. Notice that you have 2 directories:
     - group\_common for the common resources of the group (OKE, ATP)
@@ -70,12 +78,16 @@ Let's create a group and a first application (micro-service).
     ![Group App1 Env](images/starter-group-app1-env.png =80%x*)
 10. Run 
     ```
+    <copy>
     ./build_group.sh
+    </copy>
     ```
     The *build\_group.sh* will first build the directory *group\_common* and then the directory *starter*.
 11. When done, check if the application works:
     ```
+    <copy>
     http://123.123.123.123/starter/
+    </copy>
     ```
     It is also interesting to look at the created file: group\_common\_env.sh. It contains all the settings of the group.
     It is reused by all applications.
@@ -110,8 +122,10 @@ In this case, this means that it will just create new PODS in Kubernetes.
     ```
 9. Test if it works. Notice, the first app is using Java, the second one NodeJS.
     ```
+    <copy>
     http://123.123.123.123/starter/
     http://123.123.123.123/starter2/
+    </copy>
     ```
 
 Congratulation, if you reached this point, you created a group of 2 microservices using the same common resources !!
@@ -129,4 +143,4 @@ Congratulation, if you reached this point, you created a group of 2 microservice
 
 * Author - Marc Gueury
 * Contributors - Ewan Slater 
-* Last Updated - Nov, 2th 2023
+* Last Updated - Jan, 20th 2025

oci-starter-lab/instance_pool/instance_pool.md

@@ -106,7 +106,7 @@ During the build, Terraform will create:
     </copy>
     ```
     - Choose **Build**
-        ![Result](../compute/images/starter-starter-build.png)         
+        ![Result](../public_compute/images/starter-starter-build.png)         
     - It will build all and at the end you will see:
     ```
     <copy>
@@ -119,7 +119,7 @@ During the build, Terraform will create:
     - All running in an Instance Pool with 2 VMs
     - On each VM, you have PHP pages 
     - That backend gets data from the Autonomous database. 
-    ![Result](images/starter-compute-result.png)
+    ![Result](../public_compute/images/starter-compute-result.png)
 
 ## Task 4: More info
 
@@ -130,6 +130,7 @@ Instance Pool is working in the same way than the "Compute". See the "Compute" l
 You can see the IP of the 2 VMs of the Instance Pool and of the Loab-Balancer at the end of the build:
 
 ````
+<copy>
 pooled_instances_hostname_labels = [
   [
     "starter-pool2",
@@ -149,10 +150,10 @@ pooled_instances_public_ips = [
   ],
 ]
 ui_url = "http://141.147.42.164"
+</copy>
 ````
 
-
-Please also check the  "Lab 6 - How to Customize" to see how to customize this sample to your needs
+Please also check the  "Lab 7 - How to Customize" to see how to customize this sample to your needs
 
 ### Cleanup
 

oci-starter-lab/intro/intro.md

@@ -10,14 +10,14 @@ Estimated time: 30 minutes
 In this tutorial, we will create custom Cloud Native applications using:
 
 - Terraform scripts (or Resource Manager)
-- A Shape (CPU/Memory) x86, ARM or Free Tier(x86)
-- A Compute, Instance Pool, Kubernetes, Container Instance, Serverless Function
-- An user interface in HTML or ReactJS, Angular, JET, JSP, PHP, APEX
-- A backend using Java or Node, Python, .NET, Go, ORDS
+- Shape (CPU/Memory): x86, ARM or Free Tier(x86)
+- Deployment: Virtual Machine, Instance Pool, Kubernetes, Container Instance, Serverless Function
+- User Interface: HTML or ReactJS, Angular, JET, JSP, PHP, APEX
+- Backend REST service: Java or Node, Python, .NET, Go, ORDS
     - For Java: 
         - Framework: SpringBoot or Helidon, Tomcat, Micronaut
-        - VM: JDK or GraalVM JIT, GraalVM Native
-- An Oracle Autonomous Database or Oracle Database System, Pluggable Database, Oracle Database Free, MySQL, PostgreSQL
+        - JavaVM: JDK or GraalVM JIT, GraalVM Native
+- Database: Oracle Autonomous Database or Oracle Database System, Pluggable Database, Oracle Database Free, MySQL, PostgreSQL
 - Using new or existing infrastructure resources
 
 *See "Labs" below for a link to the documentation of each of these technologies*
@@ -39,8 +39,8 @@ It works like this:
 ## Labs
 
 If you have no idea on which type of infrastructure to deploy your program, please use: 
-- Lab 1 - Compute (Virtual Machine)
-- Then check the "Lab 6 - How to Customize" to see how to customize this sample to your needs
+- Lab 1 - Public Virtual Machine (Compute)
+- Then check the "Lab 7 - How to Customize" to see how to customize this sample to your needs
 
 If you have other requirements, please do other choice of labs based on requirements and the list of components. (See below)
 
@@ -53,11 +53,12 @@ Whatever choices that you do, you will get a working sample with terraform to cr
     - ARM Ampere - [ARM Shape](https://docs.oracle.com/en-us/iaas/Content/Compute/References/arm.htm)
     - Free Tier x86 - [Free Tier](https://www.oracle.com/be/cloud/free/)
 2. Infrastructure
-    - Lab 1 - Compute (Default) - [Virtual Machine](https://docs.oracle.com/en-us/iaas/Content/Compute/home.htm)
-    - Lab 2 - Instance Pool - [Instance Pools](https://docs.oracle.com/en-us/iaas/Content/Compute/Concepts/instancemanagement.htm)
-    - Lab 3 - Kubernetes - [OCI Container Engine for Kubernetes](https://docs.oracle.com/en-us/iaas/Content/ContEng/home.htm)
-    - Lab 4 - Container Instance - [Container Instance](https://docs.oracle.com/en-us/iaas/Content/container-instances/home.htm)
-    - Lab 5 - Function - [Functions](https://docs.oracle.com/en-us/iaas/Content/Functions/home.htm)
+    - Lab 1 - Public Virtual Machine (Default) - [Virtual Machine](https://docs.oracle.com/en-us/iaas/Content/Compute/home.htm)
+    - Lab 2 - Private Virtual Machine - [Virtual Machine](https://docs.oracle.com/en-us/iaas/Content/Compute/home.htm)
+    - Lab 3 - Instance Pool - [Instance Pools](https://docs.oracle.com/en-us/iaas/Content/Compute/Concepts/instancemanagement.htm)
+    - Lab 4 - Kubernetes - [OCI Container Engine for Kubernetes](https://docs.oracle.com/en-us/iaas/Content/ContEng/home.htm)
+    - Lab 5 - Container Instance - [Container Instance](https://docs.oracle.com/en-us/iaas/Content/container-instances/home.htm)
+    - Lab 7 - Function - [Functions](https://docs.oracle.com/en-us/iaas/Content/Functions/home.htm)
 3. User Interface 
     - HTML 5 - [HTML](https://html.spec.whatwg.org/multipage/)
     - ReactJS - [React](https://react.dev/)
@@ -72,7 +73,7 @@ Whatever choices that you do, you will get a working sample with terraform to cr
     - .NET - [.NET](https://dotnet.microsoft.com/)
     - Go - [Go](https://go.dev/)
     - ORDS - [Oracle REST Data Services](https://docs.oracle.com/en/database/oracle/oracle-rest-data-services/index.html)
-5. For Java, several Java Framework
+5. For Java, several Java frameworks
     - SpringBoot  - [SpringBoot](https://spring.io/projects/spring-boot)
     - Helidon - [Helidon](https://helidon.io/)
     - Tomcat Servlet/JSP - [Tomcat](https://tomcat.apache.org/)
@@ -81,7 +82,7 @@ Whatever choices that you do, you will get a working sample with terraform to cr
     - Oracle Autonomous Database - [Autonomous Database](https://docs.oracle.com/en/database/autonomous-database-cloud-services.html)
     - Oracle Database - [Base Database Service](https://docs.oracle.com/en/cloud/paas/base-database/index.html)
     - Pluggable Database - [PDB on top of an existing Oracle Database](https://docs.oracle.com/en-us/iaas/dbcs/doc/pluggable-databases.html)
-    - Oracle DB 23ai Free (running on a Compute) - [Database Free ](https://www.oracle.com/be/database/free/)
+    - Oracle DB 23ai Free (running on a Compute) - [Database Free](https://www.oracle.com/be/database/free/)
     - MySQL - [MySQL](https://docs.oracle.com/en-us/iaas/mysql-database/index.html)
     - PostgreSQL - [PostgreSQL](https://docs.oracle.com/en-us/iaas/Content/postgresql/home.htm)
     - OpenSearch - [OpenSearch](https://docs.oracle.com/en-us/iaas/Content/search-opensearch/home.htm)
@@ -102,7 +103,9 @@ https://docs.oracle.com/en-us/iaas/Content/API/Concepts/cloudshellintro_topic-Cl
 He/She just need to add a Policy to your tenancy :
 
 ```
-allow group <GROUP-NAME> to use cloud-shell-public-network in tenancy
+<copy>
+allow group GROUP-NAME to use cloud-shell-public-network in tenancy
+</copy>
 ```
 
 ### Solution 2 - Use a compute to run the build
@@ -125,13 +128,20 @@ In short,
     - Use the VCN created above
     - Follow the wizard
 - Log on the VM
-    - ssh opc@<public Build IP>
+    - ssh opc@YOUR_DEVVM
     - Follow https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/cliinstall.htm#configfile
         - oci setup config
-    - Install this script to install the needed tools:
+    - Download this script to install the needed tools and check what it does:
         ```
+        <copy>
         wget https://raw.githubusercontent.com/oracle-devrel/oci-starter/main/test_suite/install_dev.sh
+        </copy>
+        ```
+    - Run it:
+        ```
+        <copy>
         bash install_dev.sh
+        </copy>
         ```
         [Script: https://raw.githubusercontent.com/oracle-devrel/oci-starter/main/test_suite/install_dev.sh][https://raw.githubusercontent.com/oracle-devrel/oci-starter/main/test_suite/install_dev.sh]
 - Run the lab
@@ -140,4 +150,6 @@ In short,
 
 * Author - Marc Gueury
 * Contributors - Ewan Slater 
-* Last Updated - Jan, 20th 2025
+* Last Updated - Jan, 20th 2025
+
+

oci-starter-lab/kubernetes/kubernetes.md

@@ -107,7 +107,7 @@ Before to run the build. Notice that the build will create:
     </copy>
     ```
     - Choose **Build**
-        ![Result](../compute/images/starter-starter-build.png)     
+        ![Result](../public_compute/images/starter-starter-build.png)     
     - It will build all and at the end you will see:
     ```
     <copy>
@@ -127,7 +127,7 @@ Before to run the build. Notice that the build will create:
 
 ### Customize
 
-Please also check the  "Lab 6 - How to Customize" to see how to customize this sample to your needs
+Please also check the  "Lab 7 - How to Customize" to see how to customize this sample to your needs
 
 ### Kubernetes
 

oci-starter-lab/prerequisite/prerequisite.md

@@ -38,16 +38,23 @@ In short,
     - Choose the shape. The shape can be an ARM or X86 based on what you want to build.
     - Follow the wizard
 - Log on the VM
-    - ssh opc@<public Build IP>
+    - ssh opc@YOUR_DEVVM
     - Follow https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/cliinstall.htm#configfile
         - oci setup config
-    - Install Terraform
-        ````
-        # Terraform
-        sudo dnf config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
-        sudo dnf -y install terraform
-        ````
-- restart the lab
+    - Download this script to install the needed tools and check what it does:
+        ```
+        <copy>
+        wget https://raw.githubusercontent.com/oracle-devrel/oci-starter/main/test_suite/install_dev.sh
+        </copy>
+        ```
+    - Run it:
+        ```
+        <copy>
+        bash install_dev.sh
+        </copy>
+        ```
+        [Script: https://raw.githubusercontent.com/oracle-devrel/oci-starter/main/test_suite/install_dev.sh][https://raw.githubusercontent.com/oracle-devrel/oci-starter/main/test_suite/install_dev.sh]
+- Restart the lab
 
 ## Acknowledgements