Skip to content

Commit 23a2450

Browse files
vburckhardtvburckhardt
authored
Merge pull request #22 from terraform-ibm-modules/dev
* 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 * feat: add watsonx_admin_api_key as optional input * feat: add watsonx_admin_api_key as optional input * feat: bump DA versions * fix: use_existing_resource_group variable name change * feat: ability to resume failed exec (beta) * feat: ability to resume failed exec (beta) * feat: bump RAG DA to v1.2.0 * feat: bump base DA to v1.3.0 * feat: stack now create resource group * feat: add inputs to ibm_catalog.json * docs: update readme * feat: add inputs to ibm_catalog.json * feat: bump secret manager da version. Add prefix * feat: claim AI ICT Guardrails profile * feat: Configure code engine to have a minumum of 1 instance to prevent slow load time of the deployed app * feat: disable creating workload protection in scc da * feat: bump scc da to v1.50 * feat: bump to rag da v1.3.0 * fix: point to devops resource group
2 parents 481bd22 + de98469 commit 23a2450

File tree

3 files changed

+109
-55
lines changed

3 files changed

+109
-55
lines changed

‎README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Click the "Add to project" button, and select create in new project.
1111
## 2. Prereqs in target account
1212

1313
- Create an API key in the target account. Keep note of it. Give it admin privilege for now. Exact permissions will be narrowed down in future version.
14-
- Create a resource group in the target account. This steps is temporary in current alpha version - resource groups will be created in the base account DA in future versions.
1514

1615

1716
## 3. Set the input configuration for the stack
@@ -26,9 +25,9 @@ Click the "Add to project" button, and select create in new project.
2625
```json
2726
{
2827
"inputs": {
29-
"prefix": "<prefix for resources name>",
28+
"prefix": "<prefix for resources name - ensure unique>",
3029
"ibmcloud_api_key": "<API Key of the target account with sufficient permissions>",
31-
"resource_group_name": "<target resource group - must be existing in account>",
30+
"resource_group_name": "<target resource group - name of a new resource group that the stack will creates>",
3231
"region": "<region where resources are deployed>",
3332
"sample_app_git_url": "https://github.com/IBM/gen-ai-rag-watsonx-sample-application",
3433
"watsonx_admin_api_key": "<optional - admin key to use for watson if different from ibmcloud_api_key>"
@@ -40,9 +39,9 @@ Example:
4039
```json
4140
{
4241
"inputs": {
43-
"prefix": "0410",
42+
"prefix": "0418",
4443
"ibmcloud_api_key": "<your api key>",
45-
"resource_group_name": "0411-stack-service-rg",
44+
"resource_group_name": "stack-service-rg",
4645
"region": "eu-de",
4746
"sample_app_git_url": "https://github.com/IBM/gen-ai-rag-watsonx-sample-application",
4847
"watsonx_admin_api_key": "<optional - admin key to use for watson if different from ibmcloud_api_key>"

‎ibm_catalog.json‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,10 @@
2222
"name": "Code-Engine-d7b9",
2323
"compliance": {
2424
"authority": "scc-v3",
25-
"controls": [
25+
"profiles": [
2626
{
27-
"profile": {
28-
"id": "",
29-
"name": "IBM Cloud Framework for Financial Services",
30-
"version": "1.5.0"
31-
},
32-
"names": [
33-
"AC-5(c)"
34-
]
27+
"profile_name": "AI ICT Guardrails",
28+
"profile_version": "1.0.0"
3529
}
3630
]
3731
},
@@ -81,27 +75,40 @@
8175
{
8276
"key": "prefix",
8377
"type": "string",
84-
"default_value": "stack-demo",
85-
"required": false
78+
"required": true
8679
},
8780
{
8881
"name": "ibmcloud_api_key",
8982
"required": true,
9083
"type": "password",
9184
"hidden": false
9285
},
86+
{
87+
"name": "watsonx_admin_api_key",
88+
"required": false,
89+
"type": "password",
90+
"hidden": false
91+
},
9392
{
9493
"name": "resource_group_name",
9594
"required": false,
9695
"type": "string",
97-
"hidden": false
96+
"hidden": false,
97+
"default_value": "stack-service-rg"
9898
},
9999
{
100100
"name": "region",
101101
"required": false,
102102
"type": "string",
103103
"hidden": false,
104104
"default": "us-south"
105+
},
106+
{
107+
"name": "sample_app_git_url",
108+
"required": false,
109+
"type": "string",
110+
"hidden": false,
111+
"default_value": "https://github.com/IBM/gen-ai-rag-watsonx-sample-application"
105112
}
106113
],
107114
"install_type": "fullstack"

‎stack_definition.json‎

Lines changed: 86 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"inputs": [
33
{
44
"name": "prefix",
5-
"required": false,
5+
"required": true,
66
"type": "string",
77
"hidden": false,
88
"default": "rag-stack"
@@ -42,6 +42,8 @@
4242
],
4343
"members": [
4444
{
45+
"name": "1 - Account Infrastructure Base",
46+
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.9971e551-4f32-4d7f-a405-ec8937a0183d",
4547
"inputs": [
4648
{
4749
"name": "prefix",
@@ -54,17 +56,44 @@
5456
{
5557
"name": "region",
5658
"value": "ref:../../inputs/region"
59+
},
60+
{
61+
"name": "security_resource_group_name",
62+
"value": "ref:../../inputs/resource_group_name"
63+
},
64+
{
65+
"name": "audit_resource_group_name",
66+
"value": "ref:../../inputs/resource_group_name"
67+
},
68+
{
69+
"name": "observability_resource_group_name",
70+
"value": "ref:../../inputs/resource_group_name"
71+
},
72+
{
73+
"name": "management_resource_group_name",
74+
"value": "ref:../../inputs/resource_group_name"
75+
},
76+
{
77+
"name": "workload_resource_group_name",
78+
"value": "ref:../../inputs/resource_group_name"
79+
},
80+
{
81+
"name": "edge_resource_group_name",
82+
"value": "ref:../../inputs/resource_group_name"
83+
},
84+
{
85+
"name": "devops_resource_group_name",
86+
"value": "ref:../../inputs/resource_group_name"
5787
}
58-
],
59-
"name": "1 - Account Infrastructure Base",
60-
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.67f7d453-7ad6-40fe-bf64-a5ab31c55074"
88+
]
6189
},
6290
{
63-
"name": "2a - Security Service - Key Management",
91+
"name": "2a - Security Service - Key Management",
92+
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.522f2691-ac0b-4874-a21a-93a3c7ce29a0",
6493
"inputs": [
6594
{
66-
"name": "resource_group_name",
67-
"value": "ref:../../inputs/resource_group_name"
95+
"name": "resource_group_name",
96+
"value": "ref:../1 - Account Infrastructure Base/outputs/security_resource_group_name"
6897
},
6998
{
7099
"name": "use_existing_resource_group",
@@ -78,15 +107,19 @@
78107
"name": "region",
79108
"value": "ref:../../inputs/region"
80109
}
81-
],
82-
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.24da1d76-8945-4c71-be55-57651e511914"
110+
]
83111
},
84112
{
85113
"name": "2b - Security Service - Secret Manager",
114+
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.9df9062b-3c67-4117-ba3f-974f04a39800",
86115
"inputs": [
87116
{
88-
"name": "resource_group_name",
89-
"value": "ref:../../inputs/resource_group_name"
117+
"name": "prefix",
118+
"value": "ref:../../inputs/prefix"
119+
},
120+
{
121+
"name": "resource_group_name",
122+
"value": "ref:../1 - Account Infrastructure Base/outputs/security_resource_group_name"
90123
},
91124
{
92125
"name": "ibmcloud_api_key",
@@ -104,11 +137,11 @@
104137
"name": "existing_resource_group",
105138
"value": true
106139
}
107-
],
108-
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.ebffb17b-302a-4f12-925c-16c4e6a590c2"
140+
]
109141
},
110142
{
111-
"name": "2c - Security Service - Security Compliance Center",
143+
"name": "2c - Security Service - Security Compliance Center",
144+
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.124a3a88-415c-4e40-b4e1-7773be7922a7",
112145
"inputs": [
113146
{
114147
"name": "ibmcloud_api_key",
@@ -123,8 +156,8 @@
123156
"value": "ref:../../inputs/region"
124157
},
125158
{
126-
"name": "resource_group_name",
127-
"value": "ref:../../inputs/resource_group_name"
159+
"name": "resource_group_name",
160+
"value": "ref:../1 - Account Infrastructure Base/outputs/audit_resource_group_name"
128161
},
129162
{
130163
"name": "existing_kms_instance_crn",
@@ -133,12 +166,16 @@
133166
{
134167
"name": "use_existing_resource_group",
135168
"value": true
169+
},
170+
{
171+
"name": "provision_scc_workload_protection",
172+
"value": false
136173
}
137-
],
138-
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.2c901854-5628-4d48-9edf-395e22ca47d2"
174+
]
139175
},
140176
{
141177
"name": "3 - Observability - Logging Monitoring Activity Tracker",
178+
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.7d068949-1aa6-4fb0-bb47-5fa062851810",
142179
"inputs": [
143180
{
144181
"name": "ibmcloud_api_key",
@@ -151,19 +188,20 @@
151188
{
152189
"name": "existing_kms_instance_crn",
153190
"value": "ref:../2a - Security Service - Key Management/outputs/key_protect_crn"
154-
},
191+
},
155192
{
156-
"name": "resource_group_name",
157-
"value": "ref:../../inputs/resource_group_name"
193+
"name": "resource_group_name",
194+
"value": "ref:../1 - Account Infrastructure Base/outputs/observability_resource_group_name"
158195
},
159196
{
160197
"name": "use_existing_resource_group",
161198
"value": true
162199
}
163-
],
164-
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.7d068949-1aa6-4fb0-bb47-5fa062851810"
200+
]
165201
},
166-
{
202+
{
203+
"name": "4 - WatsonX SaaS services",
204+
"version_locator": "8bfb1293-8b85-4d3f-a89f-015d0a0719df.bcbb2267-a849-426b-9132-c4b47b259d81",
167205
"inputs": [
168206
{
169207
"name": "ibmcloud_api_key",
@@ -175,7 +213,7 @@
175213
},
176214
{
177215
"name": "resource_group_name",
178-
"value": "ref:../../inputs/resource_group_name"
216+
"value": "ref:../1 - Account Infrastructure Base/outputs/workload_resource_group_name"
179217
},
180218
{
181219
"name": "location",
@@ -213,11 +251,11 @@
213251
"name": "project_name",
214252
"value": "ref:../../inputs/prefix"
215253
}
216-
],
217-
"name": "4 - WatsonX SaaS services",
218-
"version_locator": "8bfb1293-8b85-4d3f-a89f-015d0a0719df.bcbb2267-a849-426b-9132-c4b47b259d81"
254+
]
219255
},
220-
{
256+
{
257+
"name": "5 - Generative AI Sample App - Code Engine Toolchain Config",
258+
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.c5f85486-df86-4b97-b44e-0d5070b8e935-global",
221259
"inputs": [
222260
{
223261
"name": "ibmcloud_api_key",
@@ -233,7 +271,7 @@
233271
},
234272
{
235273
"name": "toolchain_resource_group",
236-
"value": "ref:../../inputs/resource_group_name"
274+
"value": "ref:../1 - Account Infrastructure Base/outputs/devops_resource_group_name"
237275
},
238276
{
239277
"name": "sm_secret_group",
@@ -290,12 +328,20 @@
290328
{
291329
"name": "cd_code_engine_env_from_configmaps",
292330
"value": "app.properties"
331+
},
332+
{
333+
"name": "ci_code_engine_app_min_scale",
334+
"value": "1"
335+
},
336+
{
337+
"name": "cd_code_engine_app_min_scale",
338+
"value": "1"
293339
}
294-
],
295-
"name": "5 - Generative AI Sample App - Code Engine Toolchain Config",
296-
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.c5f85486-df86-4b97-b44e-0d5070b8e935-global"
340+
]
297341
},
298-
{
342+
{
343+
"name": "6 - Sample RAG app configuration",
344+
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.20c3a1a0-12bc-411a-b590-0c604546c965",
299345
"inputs": [
300346
{
301347
"name": "toolchain_region",
@@ -351,15 +397,17 @@
351397
},
352398
{
353399
"name": "resource_group_name",
354-
"value": "ref:../../inputs/resource_group_name"
400+
"value": "ref:../1 - Account Infrastructure Base/outputs/devops_resource_group_name"
355401
},
356402
{
357403
"name": "use_existing_resource_group",
358404
"value": true
405+
},
406+
{
407+
"name": "toolchain_region",
408+
"value": "ref:../../inputs/region"
359409
}
360-
],
361-
"name": "6 - Sample RAG app configuration",
362-
"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.c63ae996-38a8-4756-90cb-a3d9d39ee008"
410+
]
363411
}
364412
]
365413
}

0 commit comments

Comments
 (0)