Skip to content

Commit da3bbc1

Browse files
feat: Updated to consume the latest DA variations (#255)
BREAKING CHANGE: There is not supported upgrade path from previous versions to this
1 parent 8e2b936 commit da3bbc1

File tree

16 files changed

+2544
-1865
lines changed

16 files changed

+2544
-1865
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ on:
77
- created
88
jobs:
99
call-terraform-ci-pipeline:
10-
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.22.5
10+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.23.2
1111
secrets: inherit

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ on:
88

99
jobs:
1010
call-terraform-release-pipeline:
11-
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.22.5
11+
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.23.2
1212
secrets: inherit

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
.terraform
33
*.tfstate
44
*.lock.hcl
5+
.DS_Store
6+
.idea

.secrets.baseline

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
}
7878
],
7979
"results": {},
80-
"version": "0.13.1+ibm.62.dss",
80+
"version": "0.13.1+ibm.64.dss",
8181
"word_list": {
8282
"file": null,
8383
"hash": null

README.md

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Retrieval augmented generation (RAG) for watsonx on IBM Cloud
1+
# Cloud-native AI
22

33
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).
44

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

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

201-
### Removing configurations from the stack
202-
203-
You can remove a member configuration from the stack that other configurations don't depend on.
204-
205-
You can remove the following configurations in this architecture:
206-
207-
- Security and Control Center
208-
- Sample RAG App Configuration
209-
210-
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.
211-
212201
### Managing input and output variables
213202

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

222-
### Selective provisioning of observability resources
223-
224-
You can selectively provision observability resources such as Activity Tracker routes and targets, and Cloud Monitoring instances by following these steps:
225-
226-
1. In the IBM Cloud console, click the **Navigation menu** icon ![Navigation menu icon](/images/icon_hamburger.svg "Menu") > **Projects**.
227-
1. Click the project with the stacked deployable architecture that you want to update.
228-
1. Click the **Configurations** tab.
229-
1. **Navigate to the Configurations**: Access the "Essential Security - Logging Monitoring Activity Tracker" configuration by clicking on it.
230-
1. **Edit Member Configuration**: On the top right side click on 3 dots, then select Edit option to access the member configuration page.
231-
1. **Locate Optional Variables**: Under the Optional tab, you’ll find the specific variable settings.
232-
1. From the deployed details window, you can enable or disable the provisioning of specific observability resources. For example:
233-
- **IBM Cloud Logs instance** (`cloud_logs_provision`): Set this to provision or skip provisioning an IBM Cloud Logs instance.
234-
- **IBM Cloud Monitoring instance** (`cloud_monitoring_provision`): Set this to provision or skip provisioning an IBM cloud monitoring instance.
235-
- **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.
236-
- **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.
237-
1. After making the necessary changes, click Save, validate the settings, and deploy to apply the updated configuration.
238-
239-
240-
241211
### Sharing modified stacks through a private IBM Cloud catalog
242212

243213
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).
@@ -246,7 +216,7 @@ After you modify your deployable architecture in projects, you can share it with
246216

247217
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).
248218

249-
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.
219+
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.
250220

251221
## Undeploying the stack and infrastructure
252222

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

269239
1. Delete the project.
270240

0 commit comments

Comments
 (0)