Skip to content

Commit 4a02f19

Browse files
terraform-ibm-modules-opsterraform-ibm-modules-ops
authored
feat: Added a new DA member Workload - DevSecOps evidence locker Object Storage bucket which will create the pipeline required COS bucket for evidence storage<br>- fixed bug where incorrect ICR namespace was being used<br>- Added a new DA member Workload Essential Security - Red Hat OpenShift Monitoring and Workload Protection agent which will install the logging agent on the Openshift cluster.<br>- Updated several inputs to use the service picker widget (#279)
1 parent 36b5771 commit 4a02f19

File tree

7 files changed

+783
-193
lines changed

7 files changed

+783
-193
lines changed

‎ibm_catalog.json‎

Lines changed: 505 additions & 89 deletions
Large diffs are not rendered by default.

‎solutions/basic-without-sample-app/stack_definition.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
"members": [
169169
{
170170
"name": "1 - Account Configuration",
171-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e456e60-9ca9-4e9e-8f28-6265f8a12f97-global",
171+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.13eba024-dfce-4088-bec4-0b1a5fea133d-global",
172172
"inputs": [
173173
{
174174
"name": "prefix",
@@ -210,7 +210,7 @@
210210
},
211211
{
212212
"name": "2a - Essential Security - Encryption Key Management",
213-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fbb4dc92-6318-4f20-afc9-65cc586ac241-global",
213+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.83d1bcb6-41d9-43b8-bd0b-14aea5d0f923-global",
214214
"inputs": [
215215
{
216216
"name": "existing_resource_group_name",
@@ -236,7 +236,7 @@
236236
},
237237
{
238238
"name": "2b - Essential Security - Cloud Object Storage",
239-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6433c58f-9e1b-4520-ae52-5ab4f4559cf9-global",
239+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.9510728f-c31b-425c-a94a-d1585e1f22f3-global",
240240
"inputs": [
241241
{
242242
"name": "prefix",
@@ -250,7 +250,7 @@
250250
},
251251
{
252252
"name": "2c - Essential Security - Cloud Monitoring",
253-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4c21c293-3f7d-454b-97bc-9808aee58bfe-global",
253+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1245fc03-8a1a-43cd-a3d1-4e517a5d006d-global",
254254
"inputs": [
255255
{
256256
"name": "region",
@@ -280,7 +280,7 @@
280280
},
281281
{
282282
"name": "2d - Workload - Code Engine Project",
283-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8f2dddee-2211-4330-bd2d-74c84a72601d-global",
283+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.529f261f-1680-4e95-8108-b991e2527f88-global",
284284
"inputs": [
285285
{
286286
"name": "existing_resource_group_name",
@@ -324,7 +324,7 @@
324324
},
325325
{
326326
"name": "3a - Essential Security - Event Notifications",
327-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29f017cd-7a6f-45cc-a4ed-5f23505380bf-global",
327+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c6a83431-daf8-4f8a-af81-657bcd7d859f-global",
328328
"inputs": [
329329
{
330330
"name": "existing_cos_instance_crn",
@@ -448,7 +448,7 @@
448448
},
449449
{
450450
"name": "4a - Essential Security - Cloud Logs for logging",
451-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b6bf9a7b-6ac3-4821-b3e4-f274293603f3-global",
451+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a1c8b8b0-2fda-44b5-acf9-beb70ac742b4-global",
452452
"inputs": [
453453
{
454454
"name": "region",
@@ -494,7 +494,7 @@
494494
},
495495
{
496496
"name": "4b - Essential Security - App Configuration",
497-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bff2dc4d-9e19-4b2c-8890-4cda020ce39e-global",
497+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1812cea7-7a3a-4d1e-a851-a369b00988de-global",
498498
"inputs": [
499499
{
500500
"name": "existing_resource_group_name",
@@ -560,7 +560,7 @@
560560
},
561561
{
562562
"name": "4c - Essential Security - Secrets Manager",
563-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c7ba4599-f65a-4a9b-bd6b-120e52947652-global",
563+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3bfcc0f7-6134-4ad6-b123-f1271300f578-global",
564564
"inputs": [
565565
{
566566
"name": "prefix",
@@ -606,7 +606,7 @@
606606
},
607607
{
608608
"name": "4d - Essential Security - Cloud Logs for activity tracking",
609-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b6bf9a7b-6ac3-4821-b3e4-f274293603f3-global",
609+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a1c8b8b0-2fda-44b5-acf9-beb70ac742b4-global",
610610
"inputs": [
611611
{
612612
"name": "region",
@@ -664,7 +664,7 @@
664664
},
665665
{
666666
"name": "5a - Essential Security - Security and Compliance Center Workload Protection",
667-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e543e47d-1b78-4415-963c-3c59fcf5ef2b-global",
667+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.57317030-f99f-4699-b685-59036bd70c5c-global",
668668
"inputs": [
669669
{
670670
"name": "existing_resource_group_name",
@@ -698,7 +698,7 @@
698698
},
699699
{
700700
"name": "5b - Gen AI - Databases for Elasticsearch",
701-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2a25caea-0f63-4911-a5fb-c1ef792edea0-global",
701+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.890832b7-16c9-41f7-8d4f-21a8b6ba80bf-global",
702702
"inputs": [
703703
{
704704
"name": "existing_resource_group_name",
@@ -722,7 +722,7 @@
722722
},
723723
{
724724
"name": "elasticsearch_version",
725-
"value": "8.15"
725+
"value": "8.19"
726726
},
727727
{
728728
"name": "kms_encryption_enabled",
@@ -763,7 +763,7 @@
763763
},
764764
{
765765
"name": "5c - Essential Security - Activity Tracker Event Routing",
766-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1d61413e-c149-4a3a-bd6d-9207e0c60385-global",
766+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b4eaef05-19ca-46b7-a9ef-13df45fe6e20-global",
767767
"inputs": [
768768
{
769769
"name": "region",

‎solutions/basic/stack_definition.json‎

Lines changed: 81 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
"members": [
181181
{
182182
"name": "1 - Account Configuration",
183-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e456e60-9ca9-4e9e-8f28-6265f8a12f97-global",
183+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.13eba024-dfce-4088-bec4-0b1a5fea133d-global",
184184
"inputs": [
185185
{
186186
"name": "prefix",
@@ -226,7 +226,7 @@
226226
},
227227
{
228228
"name": "2a - Essential Security - Encryption Key Management",
229-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fbb4dc92-6318-4f20-afc9-65cc586ac241-global",
229+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.83d1bcb6-41d9-43b8-bd0b-14aea5d0f923-global",
230230
"inputs": [
231231
{
232232
"name": "existing_resource_group_name",
@@ -252,7 +252,7 @@
252252
},
253253
{
254254
"name": "2b - Essential Security - Cloud Object Storage",
255-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6433c58f-9e1b-4520-ae52-5ab4f4559cf9-global",
255+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.9510728f-c31b-425c-a94a-d1585e1f22f3-global",
256256
"inputs": [
257257
{
258258
"name": "prefix",
@@ -266,7 +266,7 @@
266266
},
267267
{
268268
"name": "2c - Essential Security - Cloud Monitoring",
269-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4c21c293-3f7d-454b-97bc-9808aee58bfe-global",
269+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1245fc03-8a1a-43cd-a3d1-4e517a5d006d-global",
270270
"inputs": [
271271
{
272272
"name": "region",
@@ -296,7 +296,7 @@
296296
},
297297
{
298298
"name": "2d - Workload - Code Engine Project for CI",
299-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8f2dddee-2211-4330-bd2d-74c84a72601d-global",
299+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.529f261f-1680-4e95-8108-b991e2527f88-global",
300300
"inputs": [
301301
{
302302
"name": "existing_resource_group_name",
@@ -318,7 +318,7 @@
318318
},
319319
{
320320
"name": "2e - Workload - Code Engine Project for CD",
321-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8f2dddee-2211-4330-bd2d-74c84a72601d-global",
321+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.529f261f-1680-4e95-8108-b991e2527f88-global",
322322
"inputs": [
323323
{
324324
"name": "existing_resource_group_name",
@@ -362,7 +362,7 @@
362362
},
363363
{
364364
"name": "3a - Essential Security - Event Notifications",
365-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29f017cd-7a6f-45cc-a4ed-5f23505380bf-global",
365+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c6a83431-daf8-4f8a-af81-657bcd7d859f-global",
366366
"inputs": [
367367
{
368368
"name": "existing_cos_instance_crn",
@@ -484,9 +484,51 @@
484484
}
485485
]
486486
},
487+
{
488+
"name": "3c - Workload - DevSecOps evidence locker Object Storage bucket",
489+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8ed78d53-edef-463f-8231-31fd18a41389-global",
490+
"inputs": [
491+
{
492+
"name": "prefix",
493+
"value": "ref:../../inputs/prefix"
494+
},
495+
{
496+
"name": "kms_encryption_enabled",
497+
"value": true
498+
},
499+
{
500+
"name": "existing_kms_instance_crn",
501+
"value": "ref:../2a - Essential Security - Encryption Key Management/outputs/kms_instance_crn"
502+
},
503+
{
504+
"name": "cos_key_ring_name",
505+
"value": "devsecops"
506+
},
507+
{
508+
"name": "cos_key_name",
509+
"value": "evidence-bucket-key"
510+
},
511+
{
512+
"name": "region",
513+
"value": "ref:../../inputs/region"
514+
},
515+
{
516+
"name": "existing_cos_instance_crn",
517+
"value": "ref:../2b - Essential Security - Cloud Object Storage/outputs/cos_instance_crn"
518+
},
519+
{
520+
"name": "bucket_name",
521+
"value": "evidence-locker"
522+
},
523+
{
524+
"name": "monitoring_crn",
525+
"value": "ref:../2c - Essential Security - Cloud Monitoring/outputs/cloud_monitoring_crn"
526+
}
527+
]
528+
},
487529
{
488530
"name": "4a - Essential Security - Cloud Logs for logging",
489-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b6bf9a7b-6ac3-4821-b3e4-f274293603f3-global",
531+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a1c8b8b0-2fda-44b5-acf9-beb70ac742b4-global",
490532
"inputs": [
491533
{
492534
"name": "region",
@@ -532,7 +574,7 @@
532574
},
533575
{
534576
"name": "4b - Essential Security - App Configuration",
535-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bff2dc4d-9e19-4b2c-8890-4cda020ce39e-global",
577+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1812cea7-7a3a-4d1e-a851-a369b00988de-global",
536578
"inputs": [
537579
{
538580
"name": "existing_resource_group_name",
@@ -598,7 +640,7 @@
598640
},
599641
{
600642
"name": "4c - Essential Security - Secrets Manager",
601-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c7ba4599-f65a-4a9b-bd6b-120e52947652-global",
643+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3bfcc0f7-6134-4ad6-b123-f1271300f578-global",
602644
"inputs": [
603645
{
604646
"name": "prefix",
@@ -644,7 +686,7 @@
644686
},
645687
{
646688
"name": "4d - Essential Security - Cloud Logs for activity tracking",
647-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b6bf9a7b-6ac3-4821-b3e4-f274293603f3-global",
689+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a1c8b8b0-2fda-44b5-acf9-beb70ac742b4-global",
648690
"inputs": [
649691
{
650692
"name": "region",
@@ -702,7 +744,7 @@
702744
},
703745
{
704746
"name": "5a - Essential Security - Security and Compliance Center Workload Protection",
705-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e543e47d-1b78-4415-963c-3c59fcf5ef2b-global",
747+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.57317030-f99f-4699-b685-59036bd70c5c-global",
706748
"inputs": [
707749
{
708750
"name": "existing_resource_group_name",
@@ -736,7 +778,7 @@
736778
},
737779
{
738780
"name": "5b - Gen AI - Databases for Elasticsearch",
739-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2a25caea-0f63-4911-a5fb-c1ef792edea0-global",
781+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.890832b7-16c9-41f7-8d4f-21a8b6ba80bf-global",
740782
"inputs": [
741783
{
742784
"name": "existing_resource_group_name",
@@ -760,7 +802,7 @@
760802
},
761803
{
762804
"name": "elasticsearch_version",
763-
"value": "8.15"
805+
"value": "8.19"
764806
},
765807
{
766808
"name": "kms_encryption_enabled",
@@ -802,7 +844,7 @@
802844
},
803845
{
804846
"name": "5c - Workload - DevSecOps Application Lifecycle Management",
805-
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.844034e5-4ccc-4fb7-af46-e43c20d00a72-global",
847+
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.12614d0c-67b8-4dd5-b729-1e96764f9ddc-global",
806848
"inputs": [
807849
{
808850
"name": "toolchain_name",
@@ -872,6 +914,18 @@
872914
"name": "pipeline_ibmcloud_api_key_secret_name",
873915
"value": "ibmcloud-api-key"
874916
},
917+
{
918+
"name": "cos_api_key_secret_name",
919+
"value": "ibmcloud-api-key"
920+
},
921+
{
922+
"name": "cos_bucket_name",
923+
"value": "ref:../3c - Workload - DevSecOps evidence locker Object Storage bucket/outputs/bucket_name"
924+
},
925+
{
926+
"name": "cos_endpoint",
927+
"value": "ref:../3c - Workload - DevSecOps evidence locker Object Storage bucket/outputs/s3_endpoint_direct"
928+
},
875929
{
876930
"name": "prefix",
877931
"value": "ref:../../inputs/prefix"
@@ -885,18 +939,26 @@
885939
"value": "ref:../2f - Workload - Container Registry/outputs/namespace_name"
886940
},
887941
{
888-
"name": "add_container_name_suffix",
889-
"value": true
942+
"name": "add_code_engine_prefix",
943+
"value": false
890944
},
891945
{
892-
"name": "add_code_engine_prefix",
946+
"name": "evidence_repo_enabled",
947+
"value": false
948+
},
949+
{
950+
"name": "enable_cos",
893951
"value": false
952+
},
953+
{
954+
"name": "scc_enable_scc",
955+
"value": "false"
894956
}
895957
]
896958
},
897959
{
898960
"name": "5d - Essential Security - Activity Tracker Event Routing",
899-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1d61413e-c149-4a3a-bd6d-9207e0c60385-global",
961+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b4eaef05-19ca-46b7-a9ef-13df45fe6e20-global",
900962
"inputs": [
901963
{
902964
"name": "region",

0 commit comments

Comments
 (0)