diff --git a/ibm_catalog.json b/ibm_catalog.json index bd75b75..73ff4ce 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -281,9 +281,9 @@ { "key": "app_repo_existing_url", "type": "string", - "default_value": "__NOTSET__", + "default_value": "", "description": "Bring your own existing application repository by providing the URL. This will create an integration for your application repository instead of cloning the default sample. Repositories existing in a different org will require the use of Git token. See `app_repo_git_token_secret_name` under optional variables. ", - "required": true + "required": false }, { "key": "app_repo_git_token_secret_name", @@ -459,6 +459,33 @@ "default_value": true, "description": "Set to `true` to add the compliance pipelines definitions to the DevSecOps pipelines.", "required": false + }, + { + "key": "create_privateworker_secret", + "type": "boolean", + "default_value": false, + "description": "Set to `true` to add a specified private worker service api key to the Secrets Provider.", + "required": false + }, + { + "key": "enable_privateworker", + "type": "boolean", + "default_value": false, + "description": "Set to `true` to enable private workers for the CI, CD, CC and PR pipelines. A valid service api key must be set in Secrets Manager. The name of this secret can be specified using `privateworker_credentials_secret_name`.", + "required": false + }, + { + "key": "privateworker_credentials_secret_name", + "type": "string", + "default_value": "private-worker-key", + "description": "Name of the private worker secret in the secret provider.", + "required": false + }, + { + "key": "privateworker_secret_value", + "type": "password", + "description": "The private worker service api key that will be added to the `privateworker_credentials_secret_name` secret in the secrets provider.", + "required": false } ], "outputs": [ @@ -763,9 +790,9 @@ { "key": "app_repo_existing_url", "type": "string", - "default_value": "__NOTSET__", + "default_value": "", "description": "Bring your own existing application repository by providing the URL. This will create an integration for your application repository instead of cloning the default sample. Repositories existing in a different org will require the use of Git token. See `app_repo_git_token_secret_name` under optional variables. ", - "required": true + "required": false }, { "key": "app_repo_git_token_secret_name", @@ -934,6 +961,33 @@ "default_value": true, "description": "Set to `true` to add the compliance pipelines definitions to the DevSecOps pipelines.", "required": false + }, + { + "key": "create_privateworker_secret", + "type": "boolean", + "default_value": false, + "description": "Set to `true` to add a specified private worker service api key to the Secrets Provider.", + "required": false + }, + { + "key": "enable_privateworker", + "type": "boolean", + "default_value": false, + "description": "Set to `true` to enable private workers for the CI, CD, CC and PR pipelines. A valid service api key must be set in Secrets Manager. The name of this secret can be specified using `privateworker_credentials_secret_name`.", + "required": false + }, + { + "key": "privateworker_credentials_secret_name", + "type": "string", + "default_value": "private-worker-key", + "description": "Name of the private worker secret in the secret provider.", + "required": false + }, + { + "key": "privateworker_secret_value", + "type": "password", + "description": "The private worker service api key that will be added to the `privateworker_credentials_secret_name` secret in the secrets provider.", + "required": false } ], "outputs": [ diff --git a/kubernetes/stack_definition.json b/kubernetes/stack_definition.json index c77bc8c..f079e98 100644 --- a/kubernetes/stack_definition.json +++ b/kubernetes/stack_definition.json @@ -27,8 +27,8 @@ "name": "app_repo_existing_url", "type": "string", "hidden": false, - "default": "__NOTSET__", - "required": true + "default": "", + "required": false }, { "name": "cluster_name", @@ -166,7 +166,7 @@ "required": false, "type": "string", "hidden": false, - "default": "signing_key", + "default": "signing-key", "custom_config": {} }, { @@ -390,6 +390,38 @@ "hidden": false, "default": true, "custom_config": {} + }, + { + "name": "create_privateworker_secret", + "required": false, + "type": "boolean", + "hidden": false, + "default": false, + "custom_config": {} + }, + { + "name": "enable_privateworker", + "required": false, + "type": "boolean", + "hidden": false, + "default": false, + "custom_config": {} + }, + { + "name": "privateworker_credentials_secret_name", + "required": false, + "type": "string", + "hidden": false, + "default": "private-worker-key", + "custom_config": {} + }, + { + "name": "privateworker_secret_value", + "required": false, + "type": "password", + "hidden": false, + "default": "", + "custom_config": {} } ], "members": [ @@ -413,7 +445,7 @@ } ], "name": "1 - Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3b5c0ef5-6438-4e7b-8a88-88636bc590c6-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.574fbd37-8075-49d1-a625-c7bba78288bd-global" }, { "inputs": [ @@ -435,7 +467,7 @@ } ], "name": "2 - Cloud Object Storage", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.f039fa0e-24f7-4c12-a617-1dee12997859-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88467b63-10ca-4d2f-b846-6d4d0e5cd2ee-global" }, { "inputs": [ @@ -461,7 +493,7 @@ } ], "name": "3 - Cloud Object Bucket", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.993946ad-43d0-4774-929c-22954b20af95-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.441d6b2f-a89c-43b7-93ac-022db693e9be-global" }, { "inputs": [ @@ -499,7 +531,7 @@ } ], "name": "4 - Event Notifications", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.dfffe742-c7a1-452e-90b1-3080f1f57f78-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.73d82d41-7a60-46b1-99c7-dbae7a1ec937-global" }, { "inputs": [ @@ -537,7 +569,7 @@ } ], "name": "5 - Secrets Manager", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e314e905-ca89-4947-aa94-23d270516f0e-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2cb2aa12-1005-4b28-9756-f6cd629c4d73-global" }, { "inputs": [ @@ -591,11 +623,11 @@ } ], "name": "6 - Security and Compliance Center", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29b5ef2b-a3c1-4798-9595-ed1263945f82-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e4e8fc9-8953-4456-a51c-6ed6a3ca1bd7-global" }, { "name": "7 - DevSecOps Toolchains", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.db73948a-5b92-4d65-8b41-e92ba883270f-global", + "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.1f5e0b6e-e03f-4988-8fba-6810ed59de29-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -761,6 +793,10 @@ "name": "repo_git_id", "value": "ref:../../inputs/repo_git_id" }, + { + "name": "app_repo_existing_url", + "value": "ref:../../inputs/app_repo_existing_url" + }, { "name": "evidence_repo_existing_url", "value": "ref:../../inputs/evidence_repo_existing_url" @@ -808,6 +844,22 @@ { "name": "add_pipeline_definitions", "value": "ref:../../inputs/add_pipeline_definitions" + }, + { + "name": "create_privateworker_secret", + "value": "ref:../../inputs/create_privateworker_secret" + }, + { + "name": "enable_privateworker", + "value": "ref:../../inputs/enable_privateworker" + }, + { + "name": "privateworker_credentials_secret_name", + "value": "ref:../../inputs/privateworker_credentials_secret_name" + }, + { + "name": "privateworker_secret_value", + "value": "ref:../../inputs/privateworker_secret_value" } ] } diff --git a/stack_definition.json b/stack_definition.json index 0ac6a80..bba8fda 100644 --- a/stack_definition.json +++ b/stack_definition.json @@ -27,7 +27,7 @@ "name": "app_repo_existing_url", "type": "string", "hidden": false, - "default": "__NOTSET__", + "default": "", "required": true }, { @@ -111,7 +111,7 @@ "required": false, "type": "string", "hidden": false, - "default": "signing_key", + "default": "signing-key", "custom_config": {} }, { @@ -345,6 +345,38 @@ "hidden": false, "default": true, "custom_config": {} + }, + { + "name": "create_privateworker_secret", + "required": false, + "type": "boolean", + "hidden": false, + "default": false, + "custom_config": {} + }, + { + "name": "enable_privateworker", + "required": false, + "type": "boolean", + "hidden": false, + "default": false, + "custom_config": {} + }, + { + "name": "privateworker_credentials_secret_name", + "required": false, + "type": "string", + "hidden": false, + "default": "private-worker-key", + "custom_config": {} + }, + { + "name": "privateworker_secret_value", + "required": false, + "type": "password", + "hidden": false, + "default": "", + "custom_config": {} } ], "members": [ @@ -368,7 +400,7 @@ } ], "name": "1 - Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3b5c0ef5-6438-4e7b-8a88-88636bc590c6-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.574fbd37-8075-49d1-a625-c7bba78288bd-global" }, { "inputs": [ @@ -390,7 +422,7 @@ } ], "name": "2 - Cloud Object Storage", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.f039fa0e-24f7-4c12-a617-1dee12997859-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88467b63-10ca-4d2f-b846-6d4d0e5cd2ee-global" }, { "inputs": [ @@ -416,7 +448,7 @@ } ], "name": "3 - Cloud Object Bucket", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.993946ad-43d0-4774-929c-22954b20af95-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.441d6b2f-a89c-43b7-93ac-022db693e9be-global" }, { "inputs": [ @@ -454,7 +486,7 @@ } ], "name": "4 - Event Notifications", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.dfffe742-c7a1-452e-90b1-3080f1f57f78-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.73d82d41-7a60-46b1-99c7-dbae7a1ec937-global" }, { "inputs": [ @@ -492,7 +524,7 @@ } ], "name": "5 - Secrets Manager", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e314e905-ca89-4947-aa94-23d270516f0e-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2cb2aa12-1005-4b28-9756-f6cd629c4d73-global" }, { "inputs": [ @@ -546,7 +578,7 @@ } ], "name": "6 - Security and Compliance Center", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29b5ef2b-a3c1-4798-9595-ed1263945f82-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e4e8fc9-8953-4456-a51c-6ed6a3ca1bd7-global" }, { "inputs": [ @@ -568,11 +600,11 @@ } ], "name": "7 - Code Engine Project", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.10aa04ed-4d19-4fcf-8522-478b78598acd-global" + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.77ac98d0-a734-4747-b5a6-19de3bd872da-global" }, { "name": "8 - DevSecOps Toolchains", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.9974cbde-5213-46d3-9dfb-c0f2716e4464-global", + "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.1f5e0b6e-e03f-4988-8fba-6810ed59de29-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -722,6 +754,10 @@ "name": "repo_git_id", "value": "ref:../../inputs/repo_git_id" }, + { + "name": "app_repo_existing_url", + "value": "ref:../../inputs/app_repo_existing_url" + }, { "name": "evidence_repo_existing_url", "value": "ref:../../inputs/evidence_repo_existing_url" @@ -769,7 +805,23 @@ { "name": "add_pipeline_definitions", "value": "ref:../../inputs/add_pipeline_definitions" - } + }, + { + "name": "create_privateworker_secret", + "value": "ref:../../inputs/create_privateworker_secret" + }, + { + "name": "enable_privateworker", + "value": "ref:../../inputs/enable_privateworker" + }, + { + "name": "privateworker_credentials_secret_name", + "value": "ref:../../inputs/privateworker_credentials_secret_name" + }, + { + "name": "privateworker_secret_value", + "value": "ref:../../inputs/privateworker_secret_value" + } ] } ],