Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5fc0129
fully configurable
rajatagarwal-ibm Sep 18, 2025
1faac91
fully configurable
rajatagarwal-ibm Sep 18, 2025
a5b1369
fully configurable
rajatagarwal-ibm Sep 19, 2025
2f90234
fully configurable
rajatagarwal-ibm Sep 19, 2025
75c3097
fully configurable
rajatagarwal-ibm Sep 26, 2025
8b1a847
fully configurable
rajatagarwal-ibm Sep 26, 2025
ca54565
fully configurable
rajatagarwal-ibm Sep 26, 2025
88198d2
fully configurable
rajatagarwal-ibm Sep 26, 2025
50e2e80
fully configurable
rajatagarwal-ibm Sep 26, 2025
debc543
fully configurable
rajatagarwal-ibm Sep 29, 2025
f7e7ecc
fully configurable
rajatagarwal-ibm Oct 1, 2025
6cea097
fully configurable
rajatagarwal-ibm Oct 1, 2025
24b467e
fully configurable
rajatagarwal-ibm Oct 2, 2025
e00c47a
fully configurable
rajatagarwal-ibm Oct 2, 2025
3e078e7
fully configurable
rajatagarwal-ibm Oct 2, 2025
01625de
fully configurable
rajatagarwal-ibm Oct 2, 2025
ecc32a4
fully configurable
rajatagarwal-ibm Oct 3, 2025
33570d4
fully configurable
rajatagarwal-ibm Oct 3, 2025
916906a
fully configurable
rajatagarwal-ibm Oct 3, 2025
b97dc29
fully configurable
rajatagarwal-ibm Oct 3, 2025
d98dd4d
fully configurable
rajatagarwal-ibm Oct 6, 2025
49365e2
fully configurable
rajatagarwal-ibm Oct 6, 2025
4a91030
fully configurable
rajatagarwal-ibm Oct 6, 2025
2deced3
fully configurable
rajatagarwal-ibm Oct 6, 2025
c8f9365
fully configurable
rajatagarwal-ibm Oct 6, 2025
65bb774
fully configurable
rajatagarwal-ibm Oct 6, 2025
4920f49
fully configurable
rajatagarwal-ibm Oct 6, 2025
2cb734b
fully configurable
rajatagarwal-ibm Oct 6, 2025
b1deefd
full config
rajatagarwal-ibm Oct 6, 2025
fd4e0a5
full config
rajatagarwal-ibm Oct 6, 2025
ebb598f
cleanup
ocofaigh Oct 27, 2025
c68733c
clean
ocofaigh Oct 27, 2025
0fc714a
updates
ocofaigh Oct 27, 2025
b7ffd00
fix wx
ocofaigh Oct 27, 2025
96d5467
updates
ocofaigh Nov 4, 2025
53737ea
update wx saas
ocofaigh Nov 4, 2025
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ on:
- created
jobs:
call-terraform-ci-pipeline:
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.22.5
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.23.2
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
call-terraform-release-pipeline:
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.22.5
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.23.2
secrets: inherit
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
.terraform
*.tfstate
*.lock.hcl
.DS_Store
.idea
2 changes: 1 addition & 1 deletion .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
}
],
"results": {},
"version": "0.13.1+ibm.62.dss",
"version": "0.13.1+ibm.64.dss",
"word_list": {
"file": null,
"hash": null
Expand Down
36 changes: 3 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Retrieval augmented generation (RAG) for watsonx on IBM Cloud
# Cloud-native AI

The following [deployable architecture](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-understand-module-da#what-is-da) automates the deployment of a sample gen AI Pattern on IBM Cloud, including all underlying IBM Cloud and WatsonX infrastructure. This architecture implements the best practices for watsonx gen AI Pattern deployment on IBM Cloud, as described in the [reference architecture](https://cloud.ibm.com/docs/pattern-genai-rag?topic=pattern-genai-rag-genai-pattern).

Expand Down Expand Up @@ -198,17 +198,6 @@ For example, by editing the member configuration, you can accomplish these thing

To edit the member configuration, select **Edit** from the Options icon ![Options icon](/images/action-menu-icon.svg "Options") in the member configuration row.

### Removing configurations from the stack

You can remove a member configuration from the stack that other configurations don't depend on.

You can remove the following configurations in this architecture:

- Security and Control Center
- Sample RAG App Configuration

To remove a member configuration, select **Remove from Stack** from the Options icon ![Options icon](/images/action-menu-icon.svg "Options") in the member configuration row.

### Managing input and output variables

You can add or remove input and output variables at the stack level by following these steps:
Expand All @@ -219,25 +208,6 @@ You can add or remove input and output variables at the stack level by following
1. Select a member configuration.
1. From the deployed details window, you can promote any of the configuration inputs or outputs.

### Selective provisioning of observability resources

You can selectively provision observability resources such as Activity Tracker routes and targets, and Cloud Monitoring instances by following these steps:

1. In the IBM Cloud console, click the **Navigation menu** icon ![Navigation menu icon](/images/icon_hamburger.svg "Menu") > **Projects**.
1. Click the project with the stacked deployable architecture that you want to update.
1. Click the **Configurations** tab.
1. **Navigate to the Configurations**: Access the "Essential Security - Logging Monitoring Activity Tracker" configuration by clicking on it.
1. **Edit Member Configuration**: On the top right side click on 3 dots, then select Edit option to access the member configuration page.
1. **Locate Optional Variables**: Under the Optional tab, you’ll find the specific variable settings.
1. From the deployed details window, you can enable or disable the provisioning of specific observability resources. For example:
- **IBM Cloud Logs instance** (`cloud_logs_provision`): Set this to provision or skip provisioning an IBM Cloud Logs instance.
- **IBM Cloud Monitoring instance** (`cloud_monitoring_provision`): Set this to provision or skip provisioning an IBM cloud monitoring instance.
- **Event routing from Activity Tracker to Object Storage** (`enable_at_event_routing_to_cos_bucket`): Set this to enable or disable event routing from Activity Tracker to the Object Storage bucket.
- **Event routing from Activity Tracker to Cloud Logs** (`enable_at_event_routing_to_cloud_logs`): Set this to enable or disable event routing from Activity Tracker to Cloud Logs.
1. After making the necessary changes, click Save, validate the settings, and deploy to apply the updated configuration.



### Sharing modified stacks through a private IBM Cloud catalog

After you modify your deployable architecture in projects, you can share it with others through a private IBM Cloud catalog. To share your deployable architecture, follow the steps in [Sharing your deployable architecture to your enterprise](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-share-custom).
Expand All @@ -246,7 +216,7 @@ After you modify your deployable architecture in projects, you can share it with

You can use the code of this sample automation as a guide to customize the sample app to meet your requirements. The code is available at [https://github.com/terraform-ibm-modules/terraform-ibm-rag-sample-da](https://github.com/terraform-ibm-modules/terraform-ibm-rag-sample-da).

To use your own app, remove the `Workload - Sample RAG App Configuration` member configuration from the stack. This member configuration is specific to the default sample app.
To use your own app, remove the `Workload - Sample RAG Application` member configuration from the stack. This member configuration is specific to the default sample app.

## Undeploying the stack and infrastructure

Expand All @@ -264,7 +234,7 @@ To use your own app, remove the `Workload - Sample RAG App Configuration` member
- Code Engine Project
- Delete the code engine project created for the sample application.
- Container Registry Namespace
- Delete the container registry namespace created by the CI tookchain.
- Delete the container registry namespace created by the CI toolchain.

1. Delete the project.

Expand Down
2 changes: 1 addition & 1 deletion common-dev-assets
Submodule common-dev-assets updated 36 files
+1 −1 .github/workflows/ci.yml
+1 −0 .gitignore
+21 −3 .secrets.baseline
+30 −1 README.md
+18 −11 common-go-assets/common-permanent-resources.yaml
+20 −39 commonRenovateConfig.json
+67 −0 da-assets/da-dependency-updater/README.md
+5 −0 da-assets/da-dependency-updater/requirements.txt
+250 −0 da-assets/da-dependency-updater/update_da_dependencies.py
+3 −1 examples/Dockerfile
+14 −0 examples/mock_tf_code/main.tf
+5 −0 examples/mock_tf_code/variables.tf
+220 −187 module-assets/.pre-commit-config.yaml
+5 −0 module-assets/ci/.typos.toml
+228 −41 module-assets/ci/install-deps.sh
+1 −1 module-assets/ci/run-cra-scc-v2.sh
+1 −1 module-assets/ci/run-cra.sh
+1 −17 module-assets/ci/run-tests.sh
+1 −1 module-assets/ci/submoduleVersionCheck.sh
+2 −2 module-assets/ci/terraformConfigInspect.py
+3 −5 module-assets/ci/terraformDocGoMod.py
+9 −11 module-assets/ci/terraformDocOverview.py
+3 −3 module-assets/ci/terraformDocs.py
+4 −4 module-assets/ci/terraformDocsUtils.py
+53 −2 module-assets/ci/validateIbmCatalogJson.py
+2 −4 module-assets/ci/validateJsonTemplate.py
+8 −2 pipeline-assets/contanerize.sh
+27 −21 pipeline-assets/image_vuln_scan.sh
+1 −1 scripts/update-multiple-repos/updateRepos.sh
+2 −2 scripts/update-source/requirements.txt
+2 −2 scripts/update-source/run-update-src.py
+28 −0 shared-pipeline/report.sh
+27 −0 shared-pipeline/setup.sh
+3 −3 stack-assets/.pre-commit-config.yaml
+3 −3 stack-assets/stack-updater/requirements.txt
+4 −5 stack-assets/stack-updater/update_stack_definition.py
Loading