From 6a6cd8c2a79081493edb565d7aca94267cedb1cf Mon Sep 17 00:00:00 2001 From: huayuenh Date: Tue, 8 Oct 2024 13:49:59 +0100 Subject: [PATCH 1/2] chore: update defaults --- ibm_catalog.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 57088fb..d0ecc24 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -85,7 +85,7 @@ { "key": "region", "type": "string", - "default_value": "eu-gb", + "default_value": "us-south", "description": "The region in which all resources are deployed except for SCC and Event Notifications. Those resources should be individually set and by default are set to `us-south`.", "display_name": "Region", "required": true, @@ -149,7 +149,7 @@ { "key": "ci_signing_key_secret_name", "type": "string", - "default_value": "signing_key", + "default_value": "signing-key", "description": "The name of the signing key in Secrets Manager that is required for signing the images.", "required": false }, @@ -346,7 +346,7 @@ { "key": "region", "type": "string", - "default_value": "eu-gb", + "default_value": "us-south", "description": "The region in which all resources are deployed except for SCC and Event Notifications. Those resources should be individually set and by default are set to `us-south`.", "display_name": "Region", "required": true, @@ -403,7 +403,7 @@ { "key": "create_cd_instance", "type": "boolean", - "default_value": false, + "default_value": true, "description": "Set to `true` to create a Continuous Delivery Service. This is required for running the DevSecOps toolchain pipelines and to successfuly interact with a DevOps Insights integration.", "required": false }, @@ -459,7 +459,7 @@ { "key": "ci_signing_key_secret_name", "type": "string", - "default_value": "signing_key", + "default_value": "signing-key", "description": "The name of the signing key in Secrets Manager that is required for signing the images.", "required": false }, From 02f15b3ec59a026f0630bdf63b60c9dfa537e15e Mon Sep 17 00:00:00 2001 From: huayuenh Date: Tue, 8 Oct 2024 15:04:07 +0100 Subject: [PATCH 2/2] chore: update versions --- kubernetes/stack_definition.json | 18 +++++++++--------- stack_definition.json | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index d367a03..40ac428 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -221,7 +221,7 @@ } ], "name": "1 - Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.206bfa3d-3bbe-435e-adb9-dd244fdaad86-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.58ca29c8-694e-41a8-8beb-866cb24b48e6-global" }, { "inputs": [ @@ -243,7 +243,7 @@ } ], "name": "2 - Cloud Object Storage", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1db2434c-c55f-4a5e-9814-1b39f9580b86-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.48d7439d-aaf6-42a1-bb4d-a73775caf0c2-global" }, { "inputs": [ @@ -268,14 +268,14 @@ "value": false } ], - "name": "3 - Cloud Object Storage", + "name": "3 - Cloud Object Bucket", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.993946ad-43d0-4774-929c-22954b20af95-global" }, { "inputs": [ { "name": "existing_cos_instance_crn", - "value": "ref:../../members/3 - Cloud Object Storage/outputs/cos_instance_id" + "value": "ref:../../members/3 - Cloud Object Bucket/outputs/cos_instance_id" }, { "name": "kms_endpoint_url", @@ -307,7 +307,7 @@ } ], "name": "4 - Event Notifications", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.ee7b0d6c-3603-40fb-953b-4bdbd43c3cbe-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.ef41f37e-25b7-4dc2-89b3-08d38df6789d-global" }, { "inputs": [ @@ -341,7 +341,7 @@ } ], "name": "5 - Secrets Manager", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.f98df044-b1c7-4f38-86db-6438e76a35bf-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03587d2d-38bd-42c3-983b-72469702e038-global" }, { "inputs": [ @@ -395,7 +395,7 @@ } ], "name": "6 - Security and Compliance Center", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c689955e-d4ad-4f9e-8bdc-c8929dd5991a-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88be4381-4dfe-45ee-a2f9-1d48bb6f300a-global" }, { "name": "7 - DevSecOps Toolchains", @@ -439,11 +439,11 @@ }, { "name" : "cos_bucket_name", - "value" : "ref:../../members/3 - Cloud Object Storage/outputs/bucket_name" + "value" : "ref:../../members/3 - Cloud Object Bucket/outputs/bucket_name" }, { "name" : "cos_endpoint", - "value" : "ref:../../members/3 - Cloud Object Storage/outputs/s3_endpoint_direct" + "value" : "ref:../../members/3 - Cloud Object Bucket/outputs/s3_endpoint_direct" }, { "name" : "registry_namespace", diff --git a/stack_definition.json b/stack_definition.json index a1d023b..1d54a1f 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -173,7 +173,7 @@ } ], "name": "1 - Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.206bfa3d-3bbe-435e-adb9-dd244fdaad86-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.58ca29c8-694e-41a8-8beb-866cb24b48e6-global" }, { "inputs": [ @@ -195,7 +195,7 @@ } ], "name": "2 - Cloud Object Storage", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1db2434c-c55f-4a5e-9814-1b39f9580b86-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.48d7439d-aaf6-42a1-bb4d-a73775caf0c2-global" }, { "inputs": [ @@ -259,7 +259,7 @@ } ], "name": "4 - Event Notifications", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.ee7b0d6c-3603-40fb-953b-4bdbd43c3cbe-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.ef41f37e-25b7-4dc2-89b3-08d38df6789d-global" }, { "inputs": [ @@ -293,7 +293,7 @@ } ], "name": "5 - Secrets Manager", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.f98df044-b1c7-4f38-86db-6438e76a35bf-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03587d2d-38bd-42c3-983b-72469702e038-global" }, { "inputs": [ @@ -347,7 +347,7 @@ } ], "name": "6 - Security and Compliance Center", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c689955e-d4ad-4f9e-8bdc-c8929dd5991a-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88be4381-4dfe-45ee-a2f9-1d48bb6f300a-global" }, { "inputs": [