Skip to content
Merged
4 changes: 2 additions & 2 deletions ibm_catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@
{
"key": "use_legacy_ref",
"type": "boolean",
"default_value": true,
"default_value": false,
"description": "Set to `true` to use the legacy secret reference format for Secrets Manager secrets.",
"required": false
}
Expand Down Expand Up @@ -973,7 +973,7 @@
{
"key": "use_legacy_ref",
"type": "boolean",
"default_value": true,
"default_value": false,
"description": "Set to `true` to use the legacy secret reference format for Secrets Manager secrets.",
"required": false
}
Expand Down
74 changes: 44 additions & 30 deletions kubernetes/stack_definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -443,13 +443,27 @@
{
"inputs": [
{
"name": "resource_group_name",
"name": "single_resource_group_name",
"value": "ref:../../inputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
"name": "use_existing_single_resource_group",
"value": "ref:../../inputs/use_existing_resource_group"
},
{
"name": "prefix",
"value": "ref:../../inputs/prefix"
}
],
"name": "1a - Resource Group",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b9726f66-d664-45e4-92fb-b1f1a7054bc7-global"
},
{
"inputs": [
{
"name": "existing_resource_group_name",
"value": "ref:../../members/1a - Resource Group/outputs/resource_group_name"
},
{
"name": "region",
"value": "ref:../../inputs/region"
Expand All @@ -459,21 +473,17 @@
"value": "ref:../../inputs/prefix"
}
],
"name": "1 - Key Management",
"name": "1b - Key Management",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global"
},
{
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
"value": true
"name": "existing_resource_group_name",
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
},
{
"name": "cos_instance_name",
"name": "instance_name",
"value": "evidence"
},
{
Expand All @@ -482,7 +492,7 @@
}
],
"name": "2 - Cloud Object Storage",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.30851389-2ab5-4be5-8674-7ef756cb372d-global"
},
{
"inputs": [
Expand All @@ -500,7 +510,7 @@
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
},
{
"name": "skip_iam_authorization_policy",
Expand All @@ -514,45 +524,49 @@
"inputs": [
{
"name": "existing_cos_instance_crn",
"value": "ref:../../members/3 - Cloud Object Bucket/outputs/cos_instance_id"
"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
},
{
"name": "kms_endpoint_url",
"value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint"
"name": "enable_collecting_failed_events",
"value": true
},
{
"name": "skip_cos_kms_auth_policy",
"name": "kms_encryption_enabled",
"value": true
},
{
"name": "kms_endpoint_url",
"value": "ref:../../members/1b - Key Management/outputs/kms_private_endpoint"
},
{
"name": "prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
},
{
"name": "kms_endpoint_type",
"value": "private"
},
{
"name": "resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
"value": true
"name": "existing_resource_group_name",
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
},
{
"name": "region",
"value": "ref:../../inputs/en_region"
}
],
"name": "4 - Event Notifications",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88d7308d-c2c8-4977-92cf-f85d99e27d00-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fa8ebdf4-db44-4e25-9846-9278b516cd73-global"
},
{
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
"name": "existing_resource_group_name",
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
Expand All @@ -572,7 +586,7 @@
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
},
{
"name": "existing_event_notification_instance_crn",
Expand All @@ -584,7 +598,7 @@
}
],
"name": "5 - Secrets Manager",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3d0da0a9-0327-44fc-8796-edf8e0017e25-global"
},
{
"name": "6 - DevSecOps Toolchains",
Expand All @@ -600,7 +614,7 @@
},
{
"name": "toolchain_resource_group",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
},
{
"name": "sm_secret_group",
Expand Down Expand Up @@ -628,7 +642,7 @@
},
{
"name": "enable_cos",
"value" : "true"
"value" : true
},
{
"name" : "cos_bucket_name",
Expand Down
82 changes: 48 additions & 34 deletions stack_definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -404,13 +404,27 @@
{
"inputs": [
{
"name": "resource_group_name",
"name": "single_resource_group_name",
"value": "ref:../../inputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
"name": "use_existing_single_resource_group",
"value": "ref:../../inputs/use_existing_resource_group"
},
{
"name": "prefix",
"value": "ref:../../inputs/prefix"
}
],
"name": "1a - Resource Group",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b9726f66-d664-45e4-92fb-b1f1a7054bc7-global"
},
{
"inputs": [
{
"name": "existing_resource_group_name",
"value": "ref:../../members/1a - Resource Group/outputs/single_resource_group_name"
},
{
"name": "region",
"value": "ref:../../inputs/region"
Expand All @@ -420,21 +434,17 @@
"value": "ref:../../inputs/prefix"
}
],
"name": "1 - Key Management",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.93bf5d12-a435-4510-8888-1c32db20b82b-global"
"name": "1b - Key Management",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.40397a62-acd4-4224-ba88-7d4bfa998222-global"
},
{
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
"value": true
"name": "existing_resource_group_name",
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
},
{
"name": "cos_instance_name",
"name": "instance_name",
"value": "evidence"
},
{
Expand All @@ -443,9 +453,9 @@
}
],
"name": "2 - Cloud Object Storage",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.30851389-2ab5-4be5-8674-7ef756cb372d-global"
},
{
{
"inputs": [
{
"name": "bucket_name",
Expand All @@ -461,7 +471,7 @@
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
},
{
"name": "skip_iam_authorization_policy",
Expand All @@ -475,45 +485,49 @@
"inputs": [
{
"name": "existing_cos_instance_crn",
"value": "ref:../../members/3 - Cloud Object Bucket/outputs/cos_instance_id"
"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
},
{
"name": "enable_collecting_failed_events",
"value": true
},
{
"name": "kms_encryption_enabled",
"value": true
},
{
"name": "kms_endpoint_url",
"value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint"
"value": "ref:../../members/1b - Key Management/outputs/kms_private_endpoint"
},
{
"name": "skip_cos_kms_auth_policy",
"value": true
"name": "prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
},
{
"name": "kms_endpoint_type",
"value": "private"
},
{
"name": "resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
"value": true
"name": "existing_resource_group_name",
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
},
{
"name": "region",
"value": "ref:../../inputs/en_region"
}
],
"name": "4 - Event Notifications",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88d7308d-c2c8-4977-92cf-f85d99e27d00-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fa8ebdf4-db44-4e25-9846-9278b516cd73-global"
},
{
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
"name": "existing_resource_group_name",
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
Expand All @@ -533,7 +547,7 @@
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
"value": "ref:../../members/1b - Key Management/outputs/kms_instance_crn"
},
{
"name": "existing_event_notification_instance_crn",
Expand All @@ -545,7 +559,7 @@
}
],
"name": "5 - Secrets Manager",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3d0da0a9-0327-44fc-8796-edf8e0017e25-global"
},
{
"name": "6 - DevSecOps Toolchains",
Expand All @@ -561,7 +575,7 @@
},
{
"name": "toolchain_resource_group",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
},
{
"name": "sm_secret_group",
Expand Down Expand Up @@ -589,7 +603,7 @@
},
{
"name": "enable_cos",
"value" : "true"
"value" : true
},
{
"name": "cos_bucket_name",
Expand Down Expand Up @@ -801,7 +815,7 @@
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
},
{
"name": "existing_resource_group",
Expand All @@ -823,7 +837,7 @@
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
"value": "ref:../../members/1b - Key Management/outputs/resource_group_name"
},
{
"name": "existing_resource_group",
Expand Down
Loading