0.0.11-beta (#52)

Author: vburckhardt

README.md

@@ -24,10 +24,9 @@ Before deploying the stack, ensure you have:
 **Important**:
 - Ensure region is either us-south or eu-de as watsonx can only be deployed in those 2 locations for now.
 - Ensure that the prefix is globally unique. It is used for the container registry namespace (which needs to be globally unique) in this alpha version.
-- The signing key is the base64 key obtained from the `gpg --export-secret-key <Email Address> | base64` command. See https://cloud.ibm.com/docs/devsecops?topic=devsecops-devsecops-image-signing#cd-devsecops-gpg-export for details.
 - If specifying `existing_secrets_manager_crn`, the ibmcloud_api_key that is passed as an input must have the documented read and write access to the instance
 - If specifying `existing_secrets_manager_crn`, ensure that the default security group does not contain secrets named `signing-key` and `ibmcloud-api-key` . The RAG DA currently always attempt to create secret with those names (temporary issue - to be fixed).
-  
+
 ```json
 {
     "inputs": {

deploy-many.sh

@@ -63,7 +63,7 @@ function validate_config() {
 
   STATE=$(get_validation_state)
 
-  if [[ "$STATE" != "validated" && "$STATE" != "deployed" && "$STATE" != "deploying_failed" && "$STATE" != "approved" ]]; then
+  if [[ "$STATE" != "validated" && "$STATE" != "deployed" && "$STATE" != "deploying_failed" && "$STATE" != "approved" && "$STATE" != "deleting" && "$STATE" != "deleting_failed" ]]; then
     $CLI_CMD project config-validate --project-id "$PROJECT_ID" --id "$CONFIG_ID" --output json > /tmp/validation.json
   fi
 }
@@ -74,7 +74,7 @@ function wait_for_validation() {
 
     STATE=$(get_validation_state)
 
-    if [[ "$STATE" == "validated" || "$STATE" == "deployed" || "$STATE" == "deploying_failed" || "$STATE" == "approved" || "$STATE" == "deploying" ]]; then
+    if [[ "$STATE" == "validated" || "$STATE" == "deployed" || "$STATE" == "deploying_failed" || "$STATE" == "approved" || "$STATE" == "deploying" || "$STATE" == "deleting" || "$STATE" == "deleting_failed" ]]; then
       break
     fi
 
@@ -98,7 +98,7 @@ function deploy_config() {
 
   STATE=$(get_deployment_state)
 
-  if [[ "$STATE" != "deployed" ]]; then
+  if [[ "$STATE" != "deployed" && "$STATE" != "deleting" && "$STATE" != "deleting_failed" ]]; then
     $CLI_CMD project config-deploy --project-id "$PROJECT_ID" --id "$CONFIG_ID"
   fi
 }
@@ -109,7 +109,7 @@ function wait_for_deployment() {
     STATE=$(get_deployment_state)
 
     # If the state is "deployed" or "deploying_failed", exit the loop
-    if [[ "$STATE" == "deployed" || "$STATE" == "deploying_failed" ]]; then
+    if [[ "$STATE" == "deployed" || "$STATE" == "deploying_failed" || "$STATE" == "deleting" || "$STATE" == "deleting_failed" ]]; then
       break
     fi
 
@@ -138,16 +138,44 @@ function keep_iam_session_active()
   ibmcloud iam oauth-tokens > /dev/null
 }
 
-parse_params "$@"
-get_config_ids
-set_stack_inputs
-
-# Loop through the configuration IDs and execute the functions
-for CONFIG_ID in "${CONFIG_IDS[@]}"
-do
+function validate_and_deploy()
+{
   validate_config
   wait_for_validation
   approve_config
   deploy_config
   wait_for_deployment
+}
+
+parse_params "$@"
+get_config_ids
+set_stack_inputs
+
+# Loop through the configuration IDs and execute the functions
+# for CONFIG_ID in "${CONFIG_IDS[@]}"
+# do
+#   validate_and_deploy
+# done
+
+
+####
+
+# Run base config + key management first
+for CONFIG_ID in "${CONFIG_IDS[@]:0:2}"; do
+  validate_and_deploy
+done
+
+
+# Run secret manager, security compliance, observability, and WatsonX SaaS services in parallel
+parallel_configs=("${CONFIG_IDS[2]}" "${CONFIG_IDS[3]}" "${CONFIG_IDS[4]}" "${CONFIG_IDS[5]}")
+for CONFIG_ID in "${parallel_configs[@]}"; do
+  (
+    validate_and_deploy
+  ) &
+done
+wait
+
+# Run ALM + RAG DA at the end
+for CONFIG_ID in "${CONFIG_IDS[@]:6}"; do
+  validate_and_deploy
 done

ibm_catalog.json

@@ -180,7 +180,7 @@
 							"required": false,
 							"type": "boolean",
 							"hidden": false,
-							"default_value": true
+							"default_value": false
 						}
 					],
 					"install_type": "fullstack"

stack_definition.json

@@ -65,7 +65,7 @@
       "required": false,
       "type": "boolean",
       "hidden": false,
-      "default": true
+      "default": false
     }
   ],
   "members": [
@@ -139,7 +139,7 @@
     },
     {
       "name": "2b - Security Service - Secret Manager",
-      "version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.7230f742-7f93-4647-b53d-89b7905fb5a6",
+      "version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.2bc1285e-9979-4903-98ae-537c08d50eb1",
       "inputs": [
         {
           "name": "prefix",
@@ -207,7 +207,7 @@
     },
     {
       "name": "3 - Observability - Logging Monitoring Activity Tracker",
-      "version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.826011ab-274b-4010-8935-a463d74f5d31",
+      "version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.58843031-95a7-4e8e-9abc-13c478a8bd16",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -245,7 +245,7 @@
     },
     {
       "name": "4 - WatsonX SaaS services",
-      "version_locator": "8bfb1293-8b85-4d3f-a89f-015d0a0719df.72efd2d9-801d-49b1-bfe3-614de8f0a3d7",
+      "version_locator": "8bfb1293-8b85-4d3f-a89f-015d0a0719df.02313717-33ba-43cd-8a6d-c661c0538cf3",
       "inputs": [
         {
           "name": "ibmcloud_api_key",
@@ -298,7 +298,7 @@
       ]
     },
     {
-      "name": "5 - Generative AI Sample App - Code Engine Toolchain Config",
+      "name": "5 - Sample RAG app - Application Lifecycle Management (CI,CD,CC)",
       "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.c9d011c4-f1eb-4dae-87e9-fe20372d90a5-global",
       "inputs": [
         {
@@ -401,7 +401,7 @@
     },
     {
       "name": "6 - Sample RAG app configuration",
-      "version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.bbcb2591-5e49-4633-8f59-6bc996ba3da7",
+      "version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.9ac0688e-437b-4559-8f7f-992818e9fa6c",
       "inputs": [
         {
           "name": "toolchain_region",
@@ -429,11 +429,11 @@
         },
         {
           "name": "cd_pipeline_id",
-          "value": "ref:../5 - Generative AI Sample App - Code Engine Toolchain Config/outputs/cd_pipeline_id"
+          "value": "ref:../5 - Sample RAG app - Application Lifecycle Management (CI,CD,CC)/outputs/cd_pipeline_id"
         },
         {
           "name": "ci_pipeline_id",
-          "value": "ref:../5 - Generative AI Sample App - Code Engine Toolchain Config/outputs/ci_pipeline_id"
+          "value": "ref:../5 - Sample RAG app - Application Lifecycle Management (CI,CD,CC)/outputs/ci_pipeline_id"
         },
         {
           "name": "watson_machine_learning_instance_guid",