Skip to content

Commit 8c440df

Browse files
committed
ci: update member names, add cd _instance
1 parent aad1b48 commit 8c440df

File tree

3 files changed

+70
-32
lines changed

3 files changed

+70
-32
lines changed

ibm_catalog.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,13 @@
132132
"description": "The name of the registry namespace.",
133133
"required": false
134134
},
135+
{
136+
"key": "create_cd_instance",
137+
"type": "boolean",
138+
"default_value": false,
139+
"description": "Set to `true` to create Continuous Delivery Service. ",
140+
"required": false
141+
},
135142
{
136143
"key": "pipeline_ibmcloud_api_key_secret_name",
137144
"type": "string",
@@ -365,6 +372,13 @@
365372
"description": "The name of the registry namespace.",
366373
"required": false
367374
},
375+
{
376+
"key": "create_cd_instance",
377+
"type": "boolean",
378+
"default_value": false,
379+
"description": "Set to `true` to create Continuous Delivery Service. ",
380+
"required": false
381+
},
368382
{
369383
"key": "ci_cluster_name",
370384
"type": "string",

kubernetes/stack_definition.json

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@
5050
"hidden": false,
5151
"default": "devsecops"
5252
},
53+
{
54+
"name": "create_cd_instance",
55+
"required": false,
56+
"type": "boolean",
57+
"hidden": false,
58+
"default": true,
59+
"custom_config": {}
60+
},
5361
{
5462
"name": "ci_cluster_name",
5563
"required": true,
@@ -191,7 +199,7 @@
191199
"value": "ref:../../inputs/prefix"
192200
}
193201
],
194-
"name": "1a - Key management",
202+
"name": "1a - Key Management",
195203
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.650ff7c9-5a41-4d32-a0db-6720ff56a016-global"
196204
},
197205
{
@@ -213,7 +221,7 @@
213221
"value": "ref:../../inputs/prefix"
214222
}
215223
],
216-
"name": "1b- Object storage",
224+
"name": "1b- Cloud Object Storage",
217225
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.75709d42-41a3-41ca-8f45-807652f0d1f7-global"
218226
},
219227
{
@@ -228,45 +236,45 @@
228236
},
229237
{
230238
"name": "existing_cos_instance_id",
231-
"value": "ref:../../members/1b- Object storage/outputs/cos_instance_id"
239+
"value": "ref:../../members/1b- Cloud Object Storage/outputs/cos_instance_id"
232240
},
233241
{
234242
"name": "existing_kms_instance_crn",
235-
"value": "ref:../../members/1a - Key management/outputs/kms_instance_crn"
243+
"value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn"
236244
},
237245
{
238246
"name": "skip_iam_authorization_policy",
239247
"value": false
240248
}
241249
],
242-
"name": "2 - COS Bucket",
250+
"name": "2 - Cloud Object Bucket",
243251
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1218c52a-4c9c-433a-817d-ae2f0cdc8be4-global"
244252
},
245253
{
246254
"inputs": [
247255
{
248256
"name": "existing_cos_instance_crn",
249-
"value": "ref:../../members/2 - COS Bucket/outputs/cos_instance_id"
257+
"value": "ref:../../members/2 - Cloud Object Bucket/outputs/cos_instance_id"
250258
},
251259
{
252260
"name": "kms_endpoint_url",
253-
"value": "ref:../../members/1a - Key management/outputs/kms_private_endpoint"
261+
"value": "ref:../../members/1a - Key Management/outputs/kms_private_endpoint"
254262
},
255263
{
256264
"name": "skip_cos_kms_auth_policy",
257265
"value": true
258266
},
259267
{
260268
"name": "existing_kms_instance_crn",
261-
"value": "ref:../../members/1a - Key management/outputs/kms_instance_crn"
269+
"value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn"
262270
},
263271
{
264272
"name": "kms_endpoint_type",
265273
"value": "private"
266274
},
267275
{
268276
"name": "resource_group_name",
269-
"value": "ref:../../members/1a - Key management/outputs/resource_group_name"
277+
"value": "ref:../../members/1a - Key Management/outputs/resource_group_name"
270278
},
271279
{
272280
"name": "use_existing_resource_group",
@@ -284,7 +292,7 @@
284292
"inputs": [
285293
{
286294
"name": "resource_group_name",
287-
"value": "ref:../../members/1a - Key management/outputs/resource_group_name"
295+
"value": "ref:../../members/1a - Key Management/outputs/resource_group_name"
288296
},
289297
{
290298
"name": "use_existing_resource_group",
@@ -300,7 +308,7 @@
300308
},
301309
{
302310
"name": "existing_kms_instance_crn",
303-
"value": "ref:../../members/1a - Key management/outputs/kms_instance_crn"
311+
"value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn"
304312
},
305313
{
306314
"name": "existing_event_notification_instance_crn",
@@ -318,7 +326,7 @@
318326
"inputs": [
319327
{
320328
"name": "resource_group_name",
321-
"value": "ref:../../members/1a - Key management/outputs/resource_group_name"
329+
"value": "ref:../../members/1a - Key Management/outputs/resource_group_name"
322330
},
323331
{
324332
"name": "use_existing_resource_group",
@@ -338,7 +346,7 @@
338346
},
339347
{
340348
"name": "existing_kms_instance_crn",
341-
"value": "ref:../../members/1a - Key management/outputs/kms_instance_crn"
349+
"value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn"
342350
},
343351
{
344352
"name": "existing_en_crn",
@@ -358,7 +366,7 @@
358366
},
359367
{
360368
"name": "existing_cos_instance_crn",
361-
"value": "ref:../../members/1b- Object storage/outputs/cos_instance_id"
369+
"value": "ref:../../members/1b- Cloud Object Storage/outputs/cos_instance_id"
362370
}
363371
],
364372
"name": "5 - Security and Compliance Center",
@@ -406,11 +414,11 @@
406414
},
407415
{
408416
"name" : "cos_bucket_name",
409-
"value" : "ref:../../members/2 - COS Bucket/outputs/bucket_name"
417+
"value" : "ref:../../members/2 - Cloud Object Bucket/outputs/bucket_name"
410418
},
411419
{
412420
"name" : "cos_endpoint",
413-
"value" : "ref:../../members/2 - COS Bucket/outputs/s3_endpoint_direct"
421+
"value" : "ref:../../members/2 - Cloud Object Bucket/outputs/s3_endpoint_direct"
414422
},
415423
{
416424
"name" : "registry_namespace",
@@ -424,6 +432,10 @@
424432
"name": "prefix",
425433
"value": "ref:../../inputs/prefix"
426434
},
435+
{
436+
"name": "create_cd_instance",
437+
"value": "ref:../../inputs/create_cd_instance"
438+
},
427439
{
428440
"name" : "create_secret_group",
429441
"value" : true

stack_definition.json

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@
4343
"hidden": false,
4444
"default": "devsecops"
4545
},
46+
{
47+
"name": "create_cd_instance",
48+
"required": false,
49+
"type": "boolean",
50+
"hidden": false,
51+
"default": true,
52+
"custom_config": {}
53+
},
4654
{
4755
"name": "sm_service_plan",
4856
"required": false,
@@ -136,7 +144,7 @@
136144
"value": "ref:../../inputs/prefix"
137145
}
138146
],
139-
"name": "1a - Key management",
147+
"name": "1a - Key Management",
140148
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.650ff7c9-5a41-4d32-a0db-6720ff56a016-global"
141149
},
142150
{
@@ -158,7 +166,7 @@
158166
"value": "ref:../../inputs/prefix"
159167
}
160168
],
161-
"name": "1b- Object storage",
169+
"name": "1b- Cloud Object Storage",
162170
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.75709d42-41a3-41ca-8f45-807652f0d1f7-global"
163171
},
164172
{
@@ -173,45 +181,45 @@
173181
},
174182
{
175183
"name": "existing_cos_instance_id",
176-
"value": "ref:../../members/1b- Object storage/outputs/cos_instance_id"
184+
"value": "ref:../../members/1b- Cloud Object Storage/outputs/cos_instance_id"
177185
},
178186
{
179187
"name": "existing_kms_instance_crn",
180-
"value": "ref:../../members/1a - Key management/outputs/kms_instance_crn"
188+
"value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn"
181189
},
182190
{
183191
"name": "skip_iam_authorization_policy",
184192
"value": false
185193
}
186194
],
187-
"name": "2 - COS Bucket",
195+
"name": "2 - Cloud Object Bucket",
188196
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1218c52a-4c9c-433a-817d-ae2f0cdc8be4-global"
189197
},
190198
{
191199
"inputs": [
192200
{
193201
"name": "existing_cos_instance_crn",
194-
"value": "ref:../../members/2 - COS Bucket/outputs/cos_instance_id"
202+
"value": "ref:../../members/2 - Cloud Object Bucket/outputs/cos_instance_id"
195203
},
196204
{
197205
"name": "kms_endpoint_url",
198-
"value": "ref:../../members/1a - Key management/outputs/kms_private_endpoint"
206+
"value": "ref:../../members/1a - Key Management/outputs/kms_private_endpoint"
199207
},
200208
{
201209
"name": "skip_cos_kms_auth_policy",
202210
"value": true
203211
},
204212
{
205213
"name": "existing_kms_instance_crn",
206-
"value": "ref:../../members/1a - Key management/outputs/kms_instance_crn"
214+
"value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn"
207215
},
208216
{
209217
"name": "kms_endpoint_type",
210218
"value": "private"
211219
},
212220
{
213221
"name": "resource_group_name",
214-
"value": "ref:../../members/1a - Key management/outputs/resource_group_name"
222+
"value": "ref:../../members/1a - Key Management/outputs/resource_group_name"
215223
},
216224
{
217225
"name": "use_existing_resource_group",
@@ -229,7 +237,7 @@
229237
"inputs": [
230238
{
231239
"name": "resource_group_name",
232-
"value": "ref:../../members/1a - Key management/outputs/resource_group_name"
240+
"value": "ref:../../members/1a - Key Management/outputs/resource_group_name"
233241
},
234242
{
235243
"name": "use_existing_resource_group",
@@ -245,7 +253,7 @@
245253
},
246254
{
247255
"name": "existing_kms_instance_crn",
248-
"value": "ref:../../members/1a - Key management/outputs/kms_instance_crn"
256+
"value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn"
249257
},
250258
{
251259
"name": "existing_event_notification_instance_crn",
@@ -263,7 +271,7 @@
263271
"inputs": [
264272
{
265273
"name": "resource_group_name",
266-
"value": "ref:../../members/1a - Key management/outputs/resource_group_name"
274+
"value": "ref:../../members/1a - Key Management/outputs/resource_group_name"
267275
},
268276
{
269277
"name": "use_existing_resource_group",
@@ -283,7 +291,7 @@
283291
},
284292
{
285293
"name": "existing_kms_instance_crn",
286-
"value": "ref:../../members/1a - Key management/outputs/kms_instance_crn"
294+
"value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn"
287295
},
288296
{
289297
"name": "existing_en_crn",
@@ -303,7 +311,7 @@
303311
},
304312
{
305313
"name": "existing_cos_instance_crn",
306-
"value": "ref:../../members/1b- Object storage/outputs/cos_instance_id"
314+
"value": "ref:../../members/1b- Cloud Object Storage/outputs/cos_instance_id"
307315
}
308316
],
309317
"name": "5 - Security and Compliance Center",
@@ -351,11 +359,11 @@
351359
},
352360
{
353361
"name" : "cos_bucket_name",
354-
"value" : "ref:../../members/2 - COS Bucket/outputs/bucket_name"
362+
"value" : "ref:../../members/2 - Cloud Object Bucket/outputs/bucket_name"
355363
},
356364
{
357365
"name" : "cos_endpoint",
358-
"value" : "ref:../../members/2 - COS Bucket/outputs/s3_endpoint_direct"
366+
"value" : "ref:../../members/2 - Cloud Object Bucket/outputs/s3_endpoint_direct"
359367
},
360368
{
361369
"name" : "registry_namespace",
@@ -369,6 +377,10 @@
369377
"name": "prefix",
370378
"value": "ref:../../inputs/prefix"
371379
},
380+
{
381+
"name": "create_cd_instance",
382+
"value": "ref:../../inputs/create_cd_instance"
383+
},
372384
{
373385
"name" : "create_secret_group",
374386
"value" : true

0 commit comments

Comments
 (0)