Skip to content

Commit 85724be

Browse files
vburckhardtvburckhardt
committed
Merge branch 'beta_addon_alm_poc' of github.com:terraform-ibm-modules/terraform-ibm-landing-zone into beta_addon_alm_poc
2 parents 68771ea + f0ee907 commit 85724be

File tree

3 files changed

+109
-68
lines changed

3 files changed

+109
-68
lines changed

‎ibm_catalog.json‎

Lines changed: 60 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
{
171171
"name": "testing-deploy-arch-ibm-kms",
172172
"id": "85fdbd7a-8c77-4abd-b716-653a31f3aba9",
173-
"version": ">=1.0.5",
173+
"version": ">=1.0.6",
174174
"flavors": [
175175
"standard"
176176
],
@@ -187,7 +187,7 @@
187187
{
188188
"name": "testing-deploy-arch-ibm-secrets-manager",
189189
"id": "5f149ae6-d781-460a-977d-c8c4171ad0fa",
190-
"version": ">=1.2.0",
190+
"version": ">=1.2.1",
191191
"on_by_default": true,
192192
"flavors": [
193193
"standard"
@@ -229,17 +229,14 @@
229229
],
230230
"configuration": [
231231
{
232-
"key": "prefix",
233-
"required": true
232+
"key": "prefix"
234233
},
235234
{
236-
"key": "ibmcloud_api_key",
237-
"required": true
235+
"key": "ibmcloud_api_key"
238236
},
239237
{
240238
"key": "signing_key",
241239
"display_name": "Multiline secure value",
242-
"required": false,
243240
"custom_config": {
244241
"type": "multiline_secure_value",
245242
"grouping": "deployment",
@@ -248,7 +245,6 @@
248245
},
249246
{
250247
"key": "region",
251-
"required": false,
252248
"options": [
253249
{
254250
"displayname": "us-south",
@@ -261,36 +257,34 @@
261257
]
262258
},
263259
{
264-
"key": "existing_resource_group_name",
265-
"required": false
260+
"key": "existing_resource_group_name"
266261
},
267262
{
268-
"key": "existing_secrets_manager_resource_group",
269-
"required": false
263+
"key": "existing_secrets_manager_resource_group"
270264
},
271265
{
272-
"key": "sample_app_git_url",
273-
"required": false
266+
"key": "sample_app_git_url"
274267
},
275268
{
276-
"key": "secrets_manager_name",
277-
"required": false
269+
"key": "secrets_manager_name"
278270
},
279271
{
280-
"key": "secrets_manager_region",
281-
"required": false
272+
"key": "secrets_manager_region"
282273
},
283274
{
284-
"key": "toolchain_resource_group",
285-
"required": false
275+
"key": "toolchain_resource_group"
286276
},
287277
{
288-
"key": "project_1_name",
289-
"required": false
278+
"key": "toolchain_region"
290279
},
291280
{
292-
"key": "project_2_name",
293-
"required": false
281+
"key": "registry_namespace"
282+
},
283+
{
284+
"key": "project_1_name"
285+
},
286+
{
287+
"key": "project_2_name"
294288
}
295289
],
296290
"dependency_version_2": true,
@@ -450,12 +444,25 @@
450444
"catalog_id": "f64499c8-eb50-4985-bf91-29f9e605a433",
451445
"optional": true,
452446
"on_by_default": true,
453-
"input_mapping": []
447+
"input_mapping": [
448+
{
449+
"dependency_output": "cos_instance_name",
450+
"version_input": "existing_cos_instance_name"
451+
},
452+
{
453+
"value": true,
454+
"version_input": "use_existing_cos_for_vpc_flowlogs"
455+
},
456+
{
457+
"dependency_input": "resource_group_name",
458+
"version_input": "existing_cos_resource_group"
459+
}
460+
]
454461
},
455462
{
456463
"name": "testing-deploy-arch-ibm-kms",
457464
"id": "85fdbd7a-8c77-4abd-b716-653a31f3aba9",
458-
"version": ">=1.0.5",
465+
"version": ">=1.0.6",
459466
"flavors": [
460467
"standard"
461468
],
@@ -480,7 +487,7 @@
480487
{
481488
"name": "testing-deploy-arch-ibm-secrets-manager",
482489
"id": "5f149ae6-d781-460a-977d-c8c4171ad0fa",
483-
"version": ">=1.2.0",
490+
"version": ">=1.2.1",
484491
"flavors": [
485492
"standard"
486493
],
@@ -495,6 +502,10 @@
495502
{
496503
"dependency_output": "resource_group_name",
497504
"version_input": "existing_secrets_manager_resource_group"
505+
},
506+
{
507+
"dependency_output": "secrets_manager_region",
508+
"version_input": "secrets_manager_region"
498509
}
499510
]
500511
},
@@ -522,7 +533,7 @@
522533
{
523534
"name": "testing-deploy-arch-ibm-observability-agents",
524535
"id": "d4c29f77-c55d-4a53-a218-4f026cde32c0",
525-
"version": ">=1.2.3",
536+
"version": ">=1.2.4",
526537
"flavors": [
527538
"standard"
528539
],
@@ -534,17 +545,14 @@
534545
],
535546
"configuration": [
536547
{
537-
"key": "prefix",
538-
"required": true
548+
"key": "prefix"
539549
},
540550
{
541-
"key": "ibmcloud_api_key",
542-
"required": true
551+
"key": "ibmcloud_api_key"
543552
},
544553
{
545554
"key": "signing_key",
546555
"display_name": "Multiline secure value",
547-
"required": false,
548556
"custom_config": {
549557
"type": "multiline_secure_value",
550558
"grouping": "deployment",
@@ -553,7 +561,6 @@
553561
},
554562
{
555563
"key": "region",
556-
"required": false,
557564
"options": [
558565
{
559566
"displayname": "us-south",
@@ -566,44 +573,43 @@
566573
]
567574
},
568575
{
569-
"key": "existing_resource_group_name",
570-
"required": false
576+
"key": "existing_resource_group_name"
577+
},
578+
{
579+
"key": "existing_secrets_manager_resource_group"
580+
},
581+
{
582+
"key": "sample_app_git_url"
583+
},
584+
{
585+
"key": "secrets_manager_name"
571586
},
572587
{
573-
"key": "existing_secrets_manager_resource_group",
574-
"required": false
588+
"key": "secrets_manager_region"
575589
},
576590
{
577-
"key": "sample_app_git_url",
578-
"required": false
591+
"key": "toolchain_resource_group"
579592
},
580593
{
581-
"key": "secrets_manager_name",
582-
"required": false
594+
"key": "toolchain_region"
583595
},
584596
{
585-
"key": "secrets_manager_region",
586-
"required": false
597+
"key": "registry_namespace"
587598
},
588599
{
589-
"key": "toolchain_resource_group",
590-
"required": false
600+
"key": "existing_kms_resource_group"
591601
},
592602
{
593-
"key": "existing_kms_resource_group",
594-
"required": false
603+
"key": "existing_kms_instance_name"
595604
},
596605
{
597-
"key": "existing_kms_instance_name",
598-
"required": false
606+
"key": "existing_cos_resource_group"
599607
},
600608
{
601-
"key": "existing_cos_resource_group",
602-
"required": false
609+
"key": "existing_cos_instance_name"
603610
},
604611
{
605-
"key": "existing_cos_instance_name",
606-
"required": false
612+
"key": "use_existing_cos_for_vpc_flowlogs"
607613
}
608614
],
609615
"dependency_version_2": true,

‎solutions/basic/stack_definition.json‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"required": true,
66
"type": "string",
77
"hidden": false,
8-
"default": "rag"
8+
"default": null
99
},
1010
{
1111
"name": "existing_resource_group_name",
@@ -37,28 +37,42 @@
3737
},
3838
{
3939
"name": "toolchain_resource_group",
40-
"required": false,
40+
"required": true,
4141
"type": "string",
4242
"hidden": false,
4343
"default": null
4444
},
45+
{
46+
"name": "toolchain_region",
47+
"required": true,
48+
"type": "string",
49+
"hidden": false,
50+
"default": "us-south"
51+
},
52+
{
53+
"name": "registry_namespace",
54+
"required": true,
55+
"type": "string",
56+
"hidden": false,
57+
"default": "rag-app"
58+
},
4559
{
4660
"name": "secrets_manager_name",
47-
"required": false,
61+
"required": true,
4862
"type": "string",
4963
"hidden": false,
5064
"default": null
5165
},
5266
{
5367
"name": "secrets_manager_region",
54-
"required": false,
68+
"required": true,
5569
"type": "string",
5670
"hidden": false,
57-
"default": null
71+
"default": "us-south"
5872
},
5973
{
6074
"name": "existing_secrets_manager_resource_group",
61-
"required": false,
75+
"required": true,
6276
"type": "string",
6377
"hidden": false,
6478
"default": null

‎solutions/standard/stack_definition.json‎

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"required": true,
66
"type": "string",
77
"hidden": false,
8-
"default": "rag"
8+
"default": null
99
},
1010
{
1111
"name": "existing_resource_group_name",
@@ -37,28 +37,42 @@
3737
},
3838
{
3939
"name": "toolchain_resource_group",
40-
"required": false,
40+
"required": true,
4141
"type": "string",
4242
"hidden": false,
4343
"default": null
4444
},
45+
{
46+
"name": "toolchain_region",
47+
"required": true,
48+
"type": "string",
49+
"hidden": false,
50+
"default": "us-south"
51+
},
52+
{
53+
"name": "registry_namespace",
54+
"required": true,
55+
"type": "string",
56+
"hidden": false,
57+
"default": "rag-app"
58+
},
4559
{
4660
"name": "secrets_manager_name",
47-
"required": false,
61+
"required": true,
4862
"type": "string",
4963
"hidden": false,
5064
"default": null
5165
},
5266
{
5367
"name": "secrets_manager_region",
54-
"required": false,
68+
"required": true,
5569
"type": "string",
5670
"hidden": false,
57-
"default": null
71+
"default": "us-south"
5872
},
5973
{
6074
"name": "existing_secrets_manager_resource_group",
61-
"required": false,
75+
"required": true,
6276
"type": "string",
6377
"hidden": false,
6478
"default": null
@@ -90,6 +104,13 @@
90104
"type": "string",
91105
"hidden": false,
92106
"default": null
107+
},
108+
{
109+
"name": "use_existing_cos_for_vpc_flowlogs",
110+
"required": false,
111+
"type": "boolean",
112+
"hidden": false,
113+
"default": false
93114
}
94115
],
95116
"members": [
@@ -149,7 +170,7 @@
149170
},
150171
{
151172
"name": "use_existing_cos_for_vpc_flowlogs",
152-
"value": true
173+
"value": "ref:../../inputs/use_existing_cos_for_vpc_flowlogs"
153174
},
154175
{
155176
"name": "cluster_zones",
@@ -203,7 +224,7 @@
203224
},
204225
{
205226
"name": "registry_namespace",
206-
"value": "rag-app"
227+
"value": "ref:/../../inputs/registry_namespace"
207228
},
208229
{
209230
"name": "ci_app_repo_clone_from_url",

0 commit comments

Comments
 (0)