Merge branch 'main' into add-friendly-name

docs/APIs/indexMPS.md

@@ -7,4 +7,4 @@
   }
 </style>
 
-!!swagger-http https://api.swaggerhub.com/apis/rbheopenamt/mps/2.9.0!!
+!!swagger-http https://api.swaggerhub.com/apis/rbheopenamt/mps/2.10.0!!

docs/APIs/indexRPS.md

@@ -7,4 +7,4 @@
   }
 </style>
 
-!!swagger-http https://api.swaggerhub.com/apis/rbheopenamt/rps/2.11.0!!
+!!swagger-http https://api.swaggerhub.com/apis/rbheopenamt/rps/2.13.0!!

docs/Tutorials/Scaling/Kubernetes/deployingk8s-eks.md

@@ -240,10 +240,19 @@ Where:
 
 ### 4. Database connection strings
 
-!!! warning "Warning - Using SSL/TLS with AWS RDS"
-    This tutorial uses the connection string setting of 'no-verify' for ease of setup. AWS requires additional work and provides intermediate and root certs for using SSL/TLS with a RDS DB instance. **For production, it is recommended to use a SSL connection.**
+???+ warning "Warning - Using SSL/TLS with AWS RDS"
 
-    Find more information at [Using SSL with a PostgreSQL DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/PostgreSQL.Concepts.General.SSL.html) and also at [Updating applications to connect to PostgreSQL DB instances using new SSL/TLS certificates](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/ssl-certificate-rotation-postgresql.html).
+    **Postgres 14**
+
+    By default, AWS pre-selects Postgres 14. This tutorial uses the connection string setting of `no-verify` for ease of setup. To fully configure SSL, follow the links below. **For production, it is recommended to use a SSL connection.**
+
+    Find more information at [Using SSL with a PostgreSQL DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/PostgreSQL.Concepts.General.SSL.html) and [Updating applications to connect to PostgreSQL DB instances using new SSL/TLS certificates](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/ssl-certificate-rotation-postgresql.html).
+
+    **Postgres 15**
+
+    Alternatively, if Postgres 15 is preferred and selected, the `sslmode` in the connection strings **must** be updated from `no-verify`/`disable` to `require` for the services to be able to connect to the database.  No other work is required for a test environment.
+
+    **Note:** For a fully secured, certificate-based SSL connection, the following steps must be taken in [Using SSL with a PostgreSQL DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/PostgreSQL.Concepts.General.SSL.html).  It will also require updating `sslmode` to `verify-full` or `verify-ca`.  **For production, it is highly recommended.**
 
 1. Configure the database connection strings used by MPS, RPS, and MPS Router.  
 
@@ -255,22 +264,36 @@ Where:
 
 2. Create RPS connection string secret.
 
-    ```
-    kubectl create secret generic rps --from-literal=connectionString=postgresql://<USERNAME>:<PASSWORD>@<SERVERURL>:5432/rpsdb?sslmode=no-verify
-    ```
+    === "Postgres 14"
+        ```
+        kubectl create secret generic rps --from-literal=connectionString=postgresql://<USERNAME>:<PASSWORD>@<SERVERURL>:5432/rpsdb?sslmode=no-verify
+        ```
+    === "Postgres 15"
+        ```
+        kubectl create secret generic rps --from-literal=connectionString=postgresql://<USERNAME>:<PASSWORD>@<SERVERURL>:5432/rpsdb?sslmode=require
+        ```
 
 3. Create MPS Router connection string secret.
 
-    ```
-    kubectl create secret generic mpsrouter --from-literal=connectionString=postgresql://<USERNAME>:<PASSWORD>@<SERVERURL>:5432/mpsdb?sslmode=disable
-    ```
+    === "Postgres 14"
+        ```
+        kubectl create secret generic mpsrouter --from-literal=connectionString=postgresql://<USERNAME>:<PASSWORD>@<SERVERURL>:5432/mpsdb?sslmode=disable
+        ```
+    === "Postgres 15"
+        ```
+        kubectl create secret generic mpsrouter --from-literal=connectionString=postgresql://<USERNAME>:<PASSWORD>@<SERVERURL>:5432/mpsdb?sslmode=require
+        ```
 
 4. Create MPS connection string secret.   
 
-    ```
-    kubectl create secret generic mps --from-literal=connectionString=postgresql://<USERNAME>:<PASSWORD>@<SERVERURL>:5432/mpsdb?sslmode=no-verify
-    ```
-
+    === "Postgres 14"
+        ```
+        kubectl create secret generic mps --from-literal=connectionString=postgresql://<USERNAME>:<PASSWORD>@<SERVERURL>:5432/mpsdb?sslmode=no-verify
+        ```
+    === "Postgres 15"
+        ```
+        kubectl create secret generic mps --from-literal=connectionString=postgresql://<USERNAME>:<PASSWORD>@<SERVERURL>:5432/mpsdb?sslmode=require
+        ```
 
 ## Update Configuration
 

mkdocs.yml

@@ -4,7 +4,7 @@ site_url: "https://open-amt-cloud-toolkit.github.io/docs"
 repo_url: "https://github.com/open-amt-cloud-toolkit/open-amt-cloud-toolkit"
 repo_name: "open-amt-cloud-toolkit/open-amt-cloud-toolkit"
 copyright: "Copyright © 2021 Intel Corporation"
-site_dir: site/2.11
+site_dir: site/2.12
 # Configuration
 theme:
   name: "material"
@@ -172,14 +172,14 @@ extra:
   version:
     provider: mike
   repoVersion:
-    mpsAPI: 2.9.0
-    rpsAPI: 2.11.0
-    oamtct: 2.11.0
-    rpc_go: 2.9.0
+    mpsAPI: 2.10.0
+    rpsAPI: 2.13.0
+    oamtct: 2.12.0
+    rpc_go: 2.10.0
     rpc_c: 2.0.0
     ui_toolkit: 2.0.8
     ui_toolkit_react: 3.0.0
-    ui_toolkit_angular: 5.0.1
+    ui_toolkit_angular: 6.0.0
   docsSite:
     ltsVersion: 2.0
   analytics:

site/versions.json

@@ -1,4 +1,5 @@
 [
+    {"version": "2.12", "title": "2.12 (Jun 23)", "aliases": []},
     {"version": "2.11", "title": "2.11 (May 23)", "aliases": []},
     {"version": "2.10", "title": "2.10 (Apr 23)", "aliases": []},
     {"version": "2.9", "title": "2.9 (Mar 23)", "aliases": []},