Skip to content

Commit c733bf9

Browse files
huayuenhhuayuenh
authored
BREAKING CHANGE! : Insertion of resource group module (#139)
1 parent e665f71 commit c733bf9

File tree

4 files changed

+103
-74
lines changed

4 files changed

+103
-74
lines changed

‎ibm_catalog.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@
482482
{
483483
"key": "use_legacy_ref",
484484
"type": "boolean",
485-
"default_value": true,
485+
"default_value": false,
486486
"description": "Set to `true` to use the legacy secret reference format for Secrets Manager secrets.",
487487
"required": false
488488
}
@@ -973,7 +973,7 @@
973973
{
974974
"key": "use_legacy_ref",
975975
"type": "boolean",
976-
"default_value": true,
976+
"default_value": false,
977977
"description": "Set to `true` to use the legacy secret reference format for Secrets Manager secrets.",
978978
"required": false
979979
}

‎kubernetes/stack_definition.json‎

Lines changed: 44 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -443,13 +443,27 @@
443443
{
444444
"inputs": [
445445
{
446-
"name": "resource_group_name",
446+
"name": "single_resource_group_name",
447447
"value": "ref:../../inputs/resource_group_name"
448448
},
449449
{
450-
"name": "use_existing_resource_group",
450+
"name": "use_existing_single_resource_group",
451451
"value": "ref:../../inputs/use_existing_resource_group"
452452
},
453+
{
454+
"name": "prefix",
455+
"value": "ref:../../inputs/prefix"
456+
}
457+
],
458+
"name": "1a - Resource Group",
459+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b9726f66-d664-45e4-92fb-b1f1a7054bc7-global"
460+
},
461+
{
462+
"inputs": [
463+
{
464+
"name": "existing_resource_group_name",
465+
"value": "ref:../../members/1a - Resource Group/outputs/resource_group_name"
466+
},
453467
{
454468
"name": "region",
455469
"value": "ref:../../inputs/region"
@@ -459,21 +473,17 @@
459473
"value": "ref:../../inputs/prefix"
460474
}
461475
],
462-
"name": "1 - Key Management",
476+
"name": "1b - Key Management",
463477
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global"
464478
},
465479
{
466480
"inputs": [
467481
{
468-
"name": "resource_group_name",
469-
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
470-
},
471-
{
472-
"name": "use_existing_resource_group",
473-
"value": true
482+
"name": "existing_resource_group_name",
483+
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
474484
},
475485
{
476-
"name": "cos_instance_name",
486+
"name": "instance_name",
477487
"value": "evidence"
478488
},
479489
{
@@ -482,7 +492,7 @@
482492
}
483493
],
484494
"name": "2 - Cloud Object Storage",
485-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global"
495+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.30851389-2ab5-4be5-8674-7ef756cb372d-global"
486496
},
487497
{
488498
"inputs": [
@@ -500,7 +510,7 @@
500510
},
501511
{
502512
"name": "existing_kms_instance_crn",
503-
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
513+
"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
504514
},
505515
{
506516
"name": "skip_iam_authorization_policy",
@@ -514,45 +524,49 @@
514524
"inputs": [
515525
{
516526
"name": "existing_cos_instance_crn",
517-
"value": "ref:../../members/3 - Cloud Object Bucket/outputs/cos_instance_id"
527+
"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
518528
},
519529
{
520-
"name": "kms_endpoint_url",
521-
"value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint"
530+
"name": "enable_collecting_failed_events",
531+
"value": true
522532
},
523533
{
524-
"name": "skip_cos_kms_auth_policy",
534+
"name": "kms_encryption_enabled",
525535
"value": true
526536
},
537+
{
538+
"name": "kms_endpoint_url",
539+
"value": "ref:../../members/1b - Key Management/outputs/kms_private_endpoint"
540+
},
541+
{
542+
"name": "prefix",
543+
"value": "ref:../../inputs/prefix"
544+
},
527545
{
528546
"name": "existing_kms_instance_crn",
529-
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
547+
"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
530548
},
531549
{
532550
"name": "kms_endpoint_type",
533551
"value": "private"
534552
},
535553
{
536-
"name": "resource_group_name",
537-
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
538-
},
539-
{
540-
"name": "use_existing_resource_group",
541-
"value": true
554+
"name": "existing_resource_group_name",
555+
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
542556
},
543557
{
544558
"name": "region",
545559
"value": "ref:../../inputs/en_region"
546560
}
547561
],
548562
"name": "4 - Event Notifications",
549-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88d7308d-c2c8-4977-92cf-f85d99e27d00-global"
563+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fa8ebdf4-db44-4e25-9846-9278b516cd73-global"
550564
},
551565
{
552566
"inputs": [
553567
{
554-
"name": "resource_group_name",
555-
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
568+
"name": "existing_resource_group_name",
569+
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
556570
},
557571
{
558572
"name": "use_existing_resource_group",
@@ -572,7 +586,7 @@
572586
},
573587
{
574588
"name": "existing_kms_instance_crn",
575-
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
589+
"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
576590
},
577591
{
578592
"name": "existing_event_notification_instance_crn",
@@ -584,7 +598,7 @@
584598
}
585599
],
586600
"name": "5 - Secrets Manager",
587-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
601+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3d0da0a9-0327-44fc-8796-edf8e0017e25-global"
588602
},
589603
{
590604
"name": "6 - DevSecOps Toolchains",
@@ -600,7 +614,7 @@
600614
},
601615
{
602616
"name": "toolchain_resource_group",
603-
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
617+
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
604618
},
605619
{
606620
"name": "sm_secret_group",
@@ -628,7 +642,7 @@
628642
},
629643
{
630644
"name": "enable_cos",
631-
"value" : "true"
645+
"value" : true
632646
},
633647
{
634648
"name" : "cos_bucket_name",

‎stack_definition.json‎

Lines changed: 48 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -404,13 +404,27 @@
404404
{
405405
"inputs": [
406406
{
407-
"name": "resource_group_name",
407+
"name": "single_resource_group_name",
408408
"value": "ref:../../inputs/resource_group_name"
409409
},
410410
{
411-
"name": "use_existing_resource_group",
411+
"name": "use_existing_single_resource_group",
412412
"value": "ref:../../inputs/use_existing_resource_group"
413413
},
414+
{
415+
"name": "prefix",
416+
"value": "ref:../../inputs/prefix"
417+
}
418+
],
419+
"name": "1a - Resource Group",
420+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b9726f66-d664-45e4-92fb-b1f1a7054bc7-global"
421+
},
422+
{
423+
"inputs": [
424+
{
425+
"name": "existing_resource_group_name",
426+
"value": "ref:../../members/1a - Resource Group/outputs/single_resource_group_name"
427+
},
414428
{
415429
"name": "region",
416430
"value": "ref:../../inputs/region"
@@ -420,21 +434,17 @@
420434
"value": "ref:../../inputs/prefix"
421435
}
422436
],
423-
"name": "1 - Key Management",
424-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global"
437+
"name": "1b - Key Management",
438+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.40397a62-acd4-4224-ba88-7d4bfa998222-global"
425439
},
426440
{
427441
"inputs": [
428442
{
429-
"name": "resource_group_name",
430-
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
431-
},
432-
{
433-
"name": "use_existing_resource_group",
434-
"value": true
443+
"name": "existing_resource_group_name",
444+
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
435445
},
436446
{
437-
"name": "cos_instance_name",
447+
"name": "instance_name",
438448
"value": "evidence"
439449
},
440450
{
@@ -443,9 +453,9 @@
443453
}
444454
],
445455
"name": "2 - Cloud Object Storage",
446-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global"
456+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.30851389-2ab5-4be5-8674-7ef756cb372d-global"
447457
},
448-
{
458+
{
449459
"inputs": [
450460
{
451461
"name": "bucket_name",
@@ -461,7 +471,7 @@
461471
},
462472
{
463473
"name": "existing_kms_instance_crn",
464-
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
474+
"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
465475
},
466476
{
467477
"name": "skip_iam_authorization_policy",
@@ -475,45 +485,49 @@
475485
"inputs": [
476486
{
477487
"name": "existing_cos_instance_crn",
478-
"value": "ref:../../members/3 - Cloud Object Bucket/outputs/cos_instance_id"
488+
"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
489+
},
490+
{
491+
"name": "enable_collecting_failed_events",
492+
"value": true
479493
},
494+
{
495+
"name": "kms_encryption_enabled",
496+
"value": true
497+
},
480498
{
481499
"name": "kms_endpoint_url",
482-
"value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint"
500+
"value": "ref:../../members/1b - Key Management/outputs/kms_private_endpoint"
483501
},
484502
{
485-
"name": "skip_cos_kms_auth_policy",
486-
"value": true
503+
"name": "prefix",
504+
"value": "ref:../../inputs/prefix"
487505
},
488506
{
489507
"name": "existing_kms_instance_crn",
490-
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
508+
"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
491509
},
492510
{
493511
"name": "kms_endpoint_type",
494512
"value": "private"
495513
},
496514
{
497-
"name": "resource_group_name",
498-
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
499-
},
500-
{
501-
"name": "use_existing_resource_group",
502-
"value": true
515+
"name": "existing_resource_group_name",
516+
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
503517
},
504518
{
505519
"name": "region",
506520
"value": "ref:../../inputs/en_region"
507521
}
508522
],
509523
"name": "4 - Event Notifications",
510-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88d7308d-c2c8-4977-92cf-f85d99e27d00-global"
524+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fa8ebdf4-db44-4e25-9846-9278b516cd73-global"
511525
},
512526
{
513527
"inputs": [
514528
{
515-
"name": "resource_group_name",
516-
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
529+
"name": "existing_resource_group_name",
530+
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
517531
},
518532
{
519533
"name": "use_existing_resource_group",
@@ -533,7 +547,7 @@
533547
},
534548
{
535549
"name": "existing_kms_instance_crn",
536-
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
550+
"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
537551
},
538552
{
539553
"name": "existing_event_notification_instance_crn",
@@ -545,7 +559,7 @@
545559
}
546560
],
547561
"name": "5 - Secrets Manager",
548-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
562+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3d0da0a9-0327-44fc-8796-edf8e0017e25-global"
549563
},
550564
{
551565
"name": "6 - DevSecOps Toolchains",
@@ -561,7 +575,7 @@
561575
},
562576
{
563577
"name": "toolchain_resource_group",
564-
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
578+
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
565579
},
566580
{
567581
"name": "sm_secret_group",
@@ -589,7 +603,7 @@
589603
},
590604
{
591605
"name": "enable_cos",
592-
"value" : "true"
606+
"value" : true
593607
},
594608
{
595609
"name": "cos_bucket_name",
@@ -801,7 +815,7 @@
801815
"inputs": [
802816
{
803817
"name": "resource_group_name",
804-
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
818+
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
805819
},
806820
{
807821
"name": "existing_resource_group",
@@ -823,7 +837,7 @@
823837
"inputs": [
824838
{
825839
"name": "resource_group_name",
826-
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
840+
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
827841
},
828842
{
829843
"name": "existing_resource_group",

0 commit comments

Comments
 (0)