fix: Fix app deployment issue (#6)

* feat: add inputs

* fix: remove problematic iam

* fix: image link

* fix: image link

* feat: more inputs

* feat: more wiring

* feat: add alm DA in stack

* feat: add watson

* feat: add RAG config da to stack

* feat: add RAG config da to stack

* feat: configure watsonx plans

* fix: add workaround for unique watson project name

* Use project name and config name pattern to deploy many

* chore: merge with master

* feat: bump RAG DA version

* fix: use prefix as registry namepsace for now

* fix: set context strategy

* docs: prefix

* feat: change rag app image name

* docs: add diagram

* docs: add diagram

* fix: mount app.properties as config map in code engine project

* fix: ensure unique names on repos

---------

Co-authored-by: Igor Naumov <[email protected]>

Author: vburckhardt

deploy-many.sh

@@ -2,10 +2,6 @@
 
 set -x
 
-# PROJECT_ID="546993cb-c1ba-49cd-a975-187a2b924c21"
-# CONFIG_IDS=("b79d03d5-edfe-4cd4-8787-7d70738c6529" "853c369d-3dbd-41e4-8e79-006d2c3408b2" "736fd03d-190a-4bcd-a1a5-18334d868f20" "3d76faf5-663e-4a7a-bb1d-3c98a9fa6628" "70667b97-6bb5-425b-8e6a-47c931740604")
-# STACK_CONFIG_ID="53ef9a25-3aad-4167-b548-41b19c57cad4"
-
 function parse_params() {
   PROJECT_NAME=$1
   STACK_NAME=$2
@@ -68,6 +64,7 @@ function wait_for_validation() {
     fi
 
     sleep 10 
+    keep_iam_session_active
   done
 }
 
@@ -104,6 +101,7 @@ function wait_for_deployment() {
 
     # Sleep for a few seconds before checking the state again
     sleep 10
+    keep_iam_session_active
   done
 }
 
@@ -115,11 +113,16 @@ function die()
   exit $exit_code
 }
 
+function keep_iam_session_active()
+{
+  ibmcloud iam oauth-tokens > /dev/null
+}
+
 parse_params "$@"
 get_config_ids
 set_stack_inputs
 
-# 6. Loop through the configuration IDs and execute the functions
+# Loop through the configuration IDs and execute the functions
 for CONFIG_ID in "${CONFIG_IDS[@]}"
 do
   validate_config

ibm_catalog.json

@@ -60,7 +60,7 @@
 							{
 								"diagram": {
 									"url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-retrieval-augmented-generation/main/reference-architecture/RAG Pattern v2-part-2.svg",
-									"caption": "Solution components",
+									"caption": "Reference architecture",
 									"type": "image/svg+xml",
 									"thumbnail_url": "https://raw.githubusercontent.com/terraform-ibm-modules/stack-retrieval-augmented-generation/main/reference-architecture/RAG Pattern v2-part-2.svg"
 								},

stack_definition.json

@@ -263,7 +263,7 @@
 				},
 				{
 					"name": "repositories_prefix",
-					"value": "rag-sample"
+					"value": "ref:../../inputs/prefix"
 				},
 				{
 					"name": "ci_app_name",
@@ -276,6 +276,14 @@
 				{
 					"name": "ci_code_engine_image_name",
 					"value": "code-engine-rag-app"
+				},
+				{
+					"name": "ci_code_engine_env_from_configmaps",
+					"value": "app.properties"
+				},
+				{
+					"name": "cd_code_engine_env_from_configmaps",
+					"value": "app.properties"
 				}
 			],
 			"name": "5 - Generative AI Sample App - Code Engine Toolchain Config",