Skip to content

Commit 9552d2f

Browse files
padraic-edwardspadraic-edwards
authored
Merge branch 'main' into renovate/ci-dependencies
2 parents 5ed9759 + 9b46e65 commit 9552d2f

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

‎ibm_catalog.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
{
8686
"key": "region",
8787
"type": "string",
88-
"default_value": "eu-gb",
88+
"default_value": "us-south",
8989
"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`.",
9090
"display_name": "Region",
9191
"required": true,
@@ -149,7 +149,7 @@
149149
{
150150
"key": "ci_signing_key_secret_name",
151151
"type": "string",
152-
"default_value": "signing_key",
152+
"default_value": "signing-key",
153153
"description": "The name of the signing key in Secrets Manager that is required for signing the images.",
154154
"required": false
155155
},
@@ -346,7 +346,7 @@
346346
{
347347
"key": "region",
348348
"type": "string",
349-
"default_value": "eu-gb",
349+
"default_value": "us-south",
350350
"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`.",
351351
"display_name": "Region",
352352
"required": true,
@@ -403,7 +403,7 @@
403403
{
404404
"key": "create_cd_instance",
405405
"type": "boolean",
406-
"default_value": false,
406+
"default_value": true,
407407
"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.",
408408
"required": false
409409
},
@@ -459,7 +459,7 @@
459459
{
460460
"key": "ci_signing_key_secret_name",
461461
"type": "string",
462-
"default_value": "signing_key",
462+
"default_value": "signing-key",
463463
"description": "The name of the signing key in Secrets Manager that is required for signing the images.",
464464
"required": false
465465
},

‎kubernetes/stack_definition.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
}
222222
],
223223
"name": "1 - Key Management",
224-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.650ff7c9-5a41-4d32-a0db-6720ff56a016-global"
224+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.58ca29c8-694e-41a8-8beb-866cb24b48e6-global"
225225
},
226226
{
227227
"inputs": [
@@ -243,7 +243,7 @@
243243
}
244244
],
245245
"name": "2 - Cloud Object Storage",
246-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.75709d42-41a3-41ca-8f45-807652f0d1f7-global"
246+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.48d7439d-aaf6-42a1-bb4d-a73775caf0c2-global"
247247
},
248248
{
249249
"inputs": [
@@ -268,14 +268,14 @@
268268
"value": false
269269
}
270270
],
271-
"name": "3 - Cloud Object Storage",
272-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1218c52a-4c9c-433a-817d-ae2f0cdc8be4-global"
271+
"name": "3 - Cloud Object Bucket",
272+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.993946ad-43d0-4774-929c-22954b20af95-global"
273273
},
274274
{
275275
"inputs": [
276276
{
277277
"name": "existing_cos_instance_crn",
278-
"value": "ref:../../members/3 - Cloud Object Storage/outputs/cos_instance_id"
278+
"value": "ref:../../members/3 - Cloud Object Bucket/outputs/cos_instance_id"
279279
},
280280
{
281281
"name": "kms_endpoint_url",
@@ -307,7 +307,7 @@
307307
}
308308
],
309309
"name": "4 - Event Notifications",
310-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3910e11e-c90b-48b0-b271-ec5d5049ad84-global"
310+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.ef41f37e-25b7-4dc2-89b3-08d38df6789d-global"
311311
},
312312
{
313313
"inputs": [
@@ -341,7 +341,7 @@
341341
}
342342
],
343343
"name": "5 - Secrets Manager",
344-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e806bb05-dfb9-40a8-99bf-1b9272cf8d82-global"
344+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03587d2d-38bd-42c3-983b-72469702e038-global"
345345
},
346346
{
347347
"inputs": [
@@ -395,7 +395,7 @@
395395
}
396396
],
397397
"name": "6 - Security and Compliance Center",
398-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1491b4df-b62d-4c44-9418-76b69b1fbb03-global"
398+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88be4381-4dfe-45ee-a2f9-1d48bb6f300a-global"
399399
},
400400
{
401401
"name": "7 - DevSecOps Toolchains",
@@ -439,11 +439,11 @@
439439
},
440440
{
441441
"name" : "cos_bucket_name",
442-
"value" : "ref:../../members/3 - Cloud Object Storage/outputs/bucket_name"
442+
"value" : "ref:../../members/3 - Cloud Object Bucket/outputs/bucket_name"
443443
},
444444
{
445445
"name" : "cos_endpoint",
446-
"value" : "ref:../../members/3 - Cloud Object Storage/outputs/s3_endpoint_direct"
446+
"value" : "ref:../../members/3 - Cloud Object Bucket/outputs/s3_endpoint_direct"
447447
},
448448
{
449449
"name" : "registry_namespace",
@@ -531,15 +531,15 @@
531531
"outputs": [
532532
{
533533
"name": "compliance-ci-toolchain",
534-
"value": "ref:./members/8 - DevSecOps Toolchains/outputs/compliance_ci_toolchain_url"
534+
"value": "ref:./members/7 - DevSecOps Toolchains/outputs/compliance_ci_toolchain_url"
535535
},
536536
{
537537
"name": "compliance-cd-toolchain",
538-
"value": "ref:./members/8 - DevSecOps Toolchains/outputs/compliance_cd_toolchain_url"
538+
"value": "ref:./members/7 - DevSecOps Toolchains/outputs/compliance_cd_toolchain_url"
539539
},
540540
{
541541
"name": "compliance-cc-toolchain",
542-
"value": "ref:./members/8 - DevSecOps Toolchains/outputs/compliance_cc_toolchain_url"
542+
"value": "ref:./members/7 - DevSecOps Toolchains/outputs/compliance_cc_toolchain_url"
543543
}
544544
]
545545
}

‎stack_definition.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
}
174174
],
175175
"name": "1 - Key Management",
176-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.206bfa3d-3bbe-435e-adb9-dd244fdaad86-global"
176+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.58ca29c8-694e-41a8-8beb-866cb24b48e6-global"
177177
},
178178
{
179179
"inputs": [
@@ -195,7 +195,7 @@
195195
}
196196
],
197197
"name": "2 - Cloud Object Storage",
198-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1db2434c-c55f-4a5e-9814-1b39f9580b86-global"
198+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.48d7439d-aaf6-42a1-bb4d-a73775caf0c2-global"
199199
},
200200
{
201201
"inputs": [
@@ -221,7 +221,7 @@
221221
}
222222
],
223223
"name": "3 - Cloud Object Bucket",
224-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.715785dc-e514-4dd9-9140-5a576b582f73-global"
224+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.993946ad-43d0-4774-929c-22954b20af95-global"
225225
},
226226
{
227227
"inputs": [
@@ -259,7 +259,7 @@
259259
}
260260
],
261261
"name": "4 - Event Notifications",
262-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.ee7b0d6c-3603-40fb-953b-4bdbd43c3cbe-global"
262+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.ef41f37e-25b7-4dc2-89b3-08d38df6789d-global"
263263
},
264264
{
265265
"inputs": [
@@ -293,7 +293,7 @@
293293
}
294294
],
295295
"name": "5 - Secrets Manager",
296-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.f98df044-b1c7-4f38-86db-6438e76a35bf-global"
296+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03587d2d-38bd-42c3-983b-72469702e038-global"
297297
},
298298
{
299299
"inputs": [
@@ -347,7 +347,7 @@
347347
}
348348
],
349349
"name": "6 - Security and Compliance Center",
350-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1491b4df-b62d-4c44-9418-76b69b1fbb03-global"
350+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88be4381-4dfe-45ee-a2f9-1d48bb6f300a-global"
351351
},
352352
{
353353
"inputs": [
@@ -369,7 +369,7 @@
369369
}
370370
],
371371
"name": "7 - Code Engine Project",
372-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.524cca67-fad4-4842-a52a-3c54677a6b3e-global"
372+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.10aa04ed-4d19-4fcf-8522-478b78598acd-global"
373373
},
374374
{
375375
"name": "8 - DevSecOps Toolchains",

0 commit comments

Comments
 (0)