Skip to content

Commit 26e2baf

Browse files
authored
fix: SM endpoints for ALM DA (#75)
1 parent 8ca27f6 commit 26e2baf

File tree

3 files changed

+35
-12
lines changed

3 files changed

+35
-12
lines changed

ibm_catalog.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,13 @@
131131
"required": false
132132
},
133133
{
134+
"key": "create_icr_namespace",
135+
"type": "boolean",
136+
"default_value": true,
137+
"description": "Set to `true` to have Terraform create the registry namespace. Setting to `false` will have the CI pipeline create the namespace if it does not already exist. Note: If a Terraform destroy is used, the ICR namespace along with all images will be removed.",
138+
"required": false
139+
},
140+
{
134141
"key": "registry_namespace",
135142
"type": "string",
136143
"default_value": "devsecops",

kubernetes/stack_definition.json

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,14 @@
246246
"hidden": false,
247247
"default": "",
248248
"custom_config": {}
249+
},
250+
{
251+
"name": "create_icr_namespace",
252+
"required": false,
253+
"type": "boolean",
254+
"hidden": false,
255+
"default": true,
256+
"custom_config": {}
249257
}
250258
],
251259
"members": [
@@ -451,7 +459,7 @@
451459
},
452460
{
453461
"name": "7 - DevSecOps Toolchains",
454-
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.7721322c-d795-4e44-b9a9-e10ee1565a06-global",
462+
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.db73948a-5b92-4d65-8b41-e92ba883270f-global",
455463
"inputs": [
456464
{
457465
"name": "ibmcloud_api_key",
@@ -529,10 +537,6 @@
529537
"name" : "create_signing_key",
530538
"value" : true
531539
},
532-
{
533-
"name" : "create_signing_certificate",
534-
"value" : true
535-
},
536540
{
537541
"name" : "pipeline_ibmcloud_api_key_secret_name",
538542
"value" : "ref:../../inputs/pipeline_ibmcloud_api_key_secret_name"
@@ -581,6 +585,10 @@
581585
"name": "add_container_name_suffix",
582586
"value": "true"
583587
},
588+
{
589+
"name": "create_icr_namespace",
590+
"value": "ref:../../inputs/create_icr_namespace"
591+
},
584592
{
585593
"name": "create_git_token",
586594
"value": "ref:../../inputs/create_git_token"
@@ -595,7 +603,7 @@
595603
},
596604
{
597605
"name": "repo_group",
598-
"value": "ref:../../inputs/repo_git_token_secret_value"
606+
"value": "ref:../../inputs/repo_group"
599607
}
600608
]
601609
}

stack_definition.json

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,14 @@
201201
"hidden": false,
202202
"default": "",
203203
"custom_config": {}
204+
},
205+
{
206+
"name": "create_icr_namespace",
207+
"required": false,
208+
"type": "boolean",
209+
"hidden": false,
210+
"default": true,
211+
"custom_config": {}
204212
}
205213
],
206214
"members": [
@@ -428,7 +436,7 @@
428436
},
429437
{
430438
"name": "8 - DevSecOps Toolchains",
431-
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.4efc4831-c0ce-4c27-8f88-021d5985e7f5-global",
439+
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.9974cbde-5213-46d3-9dfb-c0f2716e4464-global",
432440
"inputs": [
433441
{
434442
"name": "ibmcloud_api_key",
@@ -490,6 +498,10 @@
490498
"name": "add_container_name_suffix",
491499
"value": "true"
492500
},
501+
{
502+
"name": "create_icr_namespace",
503+
"value": "ref:../../inputs/create_icr_namespace"
504+
},
493505
{
494506
"name": "create_cd_instance",
495507
"value": "ref:../../inputs/create_cd_instance"
@@ -510,10 +522,6 @@
510522
"name": "create_signing_key",
511523
"value": true
512524
},
513-
{
514-
"name": "create_signing_certificate",
515-
"value": true
516-
},
517525
{
518526
"name": "pipeline_ibmcloud_api_key_secret_name",
519527
"value": "ref:../../inputs/pipeline_ibmcloud_api_key_secret_name"
@@ -552,7 +560,7 @@
552560
},
553561
{
554562
"name": "repo_group",
555-
"value": "ref:../../inputs/repo_git_token_secret_value"
563+
"value": "ref:../../inputs/repo_group"
556564
}
557565
]
558566
}

0 commit comments

Comments
 (0)