Skip to content

feat: private worker support #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 8, 2024
Merged

feat: private worker support #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd840e4
feat: add private worker support
huayuenh Dec 6, 2024
6dbaa7c
chore: mark app_repo as required
huayuenh Dec 6, 2024
6cbf1d9
chore: update members
huayuenh Dec 6, 2024
841ca6b
chore: update branch
huayuenh Dec 6, 2024
cb2fc72
chore: update branches
huayuenh Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 55 additions & 1 deletion ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -756,7 +783,7 @@
{
"key": "app_repo_branch",
"type": "string",
"default_value": "main",
"default_value": "master",
"description": "This is the repository branch used by the default sample application. Alternatively if `app_repo_existing_url` is provided, then the branch must reflect the default branch for that repository. Typically these branches are `main` or `master`.",
"required": false
},
Expand Down Expand Up @@ -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": [
Expand Down
66 changes: 59 additions & 7 deletions kubernetes/stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
"required": false,
"type": "string",
"hidden": false,
"default": "signing_key",
"default": "signing-key",
"custom_config": {}
},
{
Expand Down Expand Up @@ -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": [
Expand All @@ -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.00f91756-7287-4786-9ab0-fd12d30d8919-global"
},
{
"inputs": [
Expand All @@ -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.855893e4-62db-4f00-a867-0795231053fe-global"
},
{
"inputs": [
Expand Down Expand Up @@ -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.88d7308d-c2c8-4977-92cf-f85d99e27d00-global"
},
{
"inputs": [
Expand Down Expand Up @@ -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.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
},
{
"inputs": [
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
}
]
}
Expand Down
70 changes: 61 additions & 9 deletions stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"required": false,
"type": "string",
"hidden": false,
"default": "signing_key",
"default": "signing-key",
"custom_config": {}
},
{
Expand Down Expand Up @@ -144,7 +144,7 @@
"name": "app_repo_branch",
"type": "string",
"hidden": false,
"default": "main",
"default": "master",
"required": false
},
{
Expand Down Expand Up @@ -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": [
Expand All @@ -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.00f91756-7287-4786-9ab0-fd12d30d8919-global"
},
{
"inputs": [
Expand All @@ -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.855893e4-62db-4f00-a867-0795231053fe-global"
},
{
"inputs": [
Expand Down Expand Up @@ -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.88d7308d-c2c8-4977-92cf-f85d99e27d00-global"
},
{
"inputs": [
Expand Down Expand Up @@ -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.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
},
{
"inputs": [
Expand Down Expand Up @@ -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": [
Expand All @@ -572,7 +604,7 @@
},
{
"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",
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
}
]
}
],
Expand Down