Skip to content
This repository was archived by the owner on Dec 17, 2024. It is now read-only.

Commit 2717b22

Browse files
authored
feat: added support to provision IBM Cloud Event Notifications DA (#7) </br> - the order of the list DA members in stack has been changed </br> - version of DA members upgraded to the latest </br> - small input variables improvements
1 parent d16c81f commit 2717b22

File tree

5 files changed

+244
-156
lines changed

5 files changed

+244
-156
lines changed

.catalog-onboard-pipeline.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ offerings:
66
catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
77
offering_id: 6068c87c-ed4b-4427-be22-d7ac65fa2a8e
88
variations:
9-
- name: Code-Engine-d7b9
9+
- name: basic
1010
mark_ready: true
1111
install_type: fullstack
1212
format_kind: stack

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ The automation is configured to deploy a Trial version of Secret Manager by defa
152152
Here are the limitations of the Trial version:
153153
* **Account limitation**: Only one Trial instance of Secret Manager can be deployed at a time in a given account.
154154
* **Deployment error**: You will encounter an error in the Secret Manager deployment step if there is already a Trial instance deployed in the same account.
155-
* **Re-deployment failure**: If the automation provisions a Trial version of Secrets Manager, and is un-deployed and then re-deployed again with the Trial version in the same account, the "2b - Security Service - Secret Manager" deployment will fail. This is because you can only have one Trial version of Secrets Manager in an account, and even after deletion, the prior Trial version of Secrets Manager needs to be removed from the "reclamation" state as well.
155+
* **Re-deployment failure**: If the automation provisions a Trial version of Secrets Manager, and is un-deployed and then re-deployed again with the Trial version in the same account, the "5a - Security Service - Secret Manager" deployment will fail. This is because you can only have one Trial version of Secrets Manager in an account, and even after deletion, the prior Trial version of Secrets Manager needs to be removed from the "reclamation" state as well.
156156

157157

158158
**What are reclamations?**

ibm_catalog.json

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
"support_details": "This product is in the community registry, as such support is handled through the originated repo. If you experience issues please open an issue in that repository [https://github.com/terraform-ibm-modules/stack-retrieval-augmented-generation/issues](https://github.com/terraform-ibm-modules/stack-retrieval-augmented-generation/issues). Please note this product is not supported via the IBM Cloud Support Center.",
5858
"flavors": [
5959
{
60-
"label": "Deploy on Code Engine",
61-
"name": "Code-Engine-d7b9",
60+
"label": "Basic",
61+
"name": "basic",
6262
"compliance": {
6363
"authority": "scc-v3",
6464
"profiles": [
@@ -144,6 +144,13 @@
144144
"role_crns": [
145145
"crn:v1:bluemix:public:iam::::role:Editor"
146146
]
147+
},
148+
{
149+
"service_name": "event-notifications",
150+
"role_crns": [
151+
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
152+
"crn:v1:bluemix:public:iam::::role:Editor"
153+
]
147154
}
148155
],
149156
"architecture": {
@@ -297,6 +304,30 @@
297304
"default_value": "__NULL__",
298305
"description": "The CRN of an existing KMS instance to use in this solution. If not set, a new KP instance is provisioned.",
299306
"required": false
307+
},
308+
{
309+
"key": "existing_en_instance_crn",
310+
"type": "string",
311+
"default_value": "__NULL__",
312+
"description": "The CRN of an existing event notification instance to use in this solution. If not set, a new event notification instance is provisioned.",
313+
"required": false
314+
},
315+
{
316+
"key": "elasticsearch_plan",
317+
"type": "string",
318+
"default_value": "enterprise",
319+
"description": "The pricing plan for the Databases for Elasticsearch instance.",
320+
"required": false,
321+
"options": [
322+
{
323+
"displayname": "Enterprise",
324+
"value": "enterprise"
325+
},
326+
{
327+
"displayname": "Platinum",
328+
"value": "platinum"
329+
}
330+
]
300331
}
301332
],
302333
"outputs": [

sample_deploy_config.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
"config_order": [
66
"1 - Account Infrastructure Base",
77
"2a - Security Service - Key Management",
8-
"2b - Security Service - Secret Manager",
9-
"2c - Security Service - Security Compliance Center",
10-
"3 - Observability - Logging Monitoring Activity Tracker",
11-
"4 - WatsonX SaaS services",
12-
"5 - Databases for Elasticsearch",
8+
"2b - WatsonX SaaS services",
9+
"3a - Observability - Logging Monitoring Activity Tracker",
10+
"3b - Databases for Elasticsearch",
11+
"4 - Event Notifications",
12+
"5a - Security Service - Secret Manager",
13+
"5b - Security Service - Security Compliance Center",
1314
"6 - Sample RAG app - Application Lifecycle Management",
1415
"7 - Sample RAG app configuration"
1516
],

0 commit comments

Comments
 (0)