Skip to content

feat: app, deployment, config repo airgap support #98

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
Jan 30, 2025
Merged

feat: app, deployment, config repo airgap support #98

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1599ebb
chore: air gapped custom repos option
huayuenh Jan 28, 2025
9fca8ea
chore: add standard api key support
huayuenh Jan 28, 2025
0ce8a51
chore: update locators
huayuenh Jan 29, 2025
b8c4a28
feat: add app, deployment, config independent airgap support
huayuenh Jan 29, 2025
f415d16
fix: variable type
huayuenh Jan 30, 2025
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: 56 additions & 0 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,62 @@
"default_value": false,
"description": "Set to `true` to create a Git Token secret in the speficied Secrets Manager, using the name set in `repo_git_token_secret_name` and the value set in `repo_git_token_secret_value`."
},
{
"key": "custom_app_repo_title",
"type": "string",
"default_value": "",
"description": "(Optional) The title of the server. e.g. My Git Enterprise Server. Applies to the sample application repository, pipeline config repository and additionally the deployment repository of the CD toolchain. Takes precedence over `repo_title`, if also set.",
"required": false
},
{
"key": "custom_app_repo_root_url",
"type": "string",
"default_value": "",
"description": "(Optional) The Root URL of the server. e.g. https://git.example.com. Applies to the sample application repository, pipeline config repository and additionally the deployment repository of the CD toolchain. Takes precedence over `repo_root_url`, if also set.",
"required": false
},
{
"key": "custom_app_repo_blind_connection",
"type": "string",
"default_value": "false",
"description": "Setting this value to `true` means the server is not addressable on the public internet. IBM Cloud will not be able to validate the connection details you provide. Certain functionality that requires API access to the git server will be disabled. Delivery pipeline will only work using a private worker that has network access to the git server.",
"required": false
},
{
"key": "custom_app_repo_git_id",
"type": "string",
"default_value": "",
"description": "The Git ID for the application repositories. Used by the sample application repository, pipeline config repository and additionally the deployment repository of the CD toolchain. Takes precedence for these repositories over the value set in `repo_git_id`.",
"required": false
},
{
"key": "custom_app_repo_group",
"type": "string",
"default_value": "",
"description": "Specify the Git user or group for your application. This must be set if the repository authentication type is `pat` (personal access token). Used by the sample application repository, pipeline config repository and additionally the deployment repository of the CD toolchain. Takes precedence for these repositories over the value set in `repo_group`.",
"required": false
},
{
"key": "custom_app_repo_git_provider",
"type": "string",
"default_value": "",
"description": "The Git provider type. Used by the sample application repository, pipeline config repository and additionally the deployment repository of the CD toolchain. Takes precedence for these repositories over the value set in `repo_git_provider`.",
"required": false
},
{
"key": "custom_app_repo_git_token_secret_name",
"type": "string",
"default_value": "",
"description": "The name of the Git token secret in the secret provider used for accessing the sample application repository, pipeline config repository and additionally the deployment repository of the CD toolchain. Takes precedence for these repositories over the value set in `repo_git_token_secret_name`.",
"required": false
},
{
"key": "custom_app_repo_git_token_secret_value",
"type": "password",
"default_value": "",
"description": "The personal access token that will be added to the `custom_app_repo_git_token_secret_name` secret in the secrets provider. Note if also using `repo_git_token_secret_name` to set a Git Token in Secrets Manager, the names of the secrets must be different.",
"required": false
},
{
"key": "repo_git_token_secret_name",
"required": false,
Expand Down
120 changes: 114 additions & 6 deletions stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,14 @@
"default": false,
"custom_config": {}
},
{
"name": "create_icr_namespace",
"required": false,
"type": "boolean",
"hidden": false,
"default": true,
"custom_config": {}
},
{
"name": "create_git_token",
"required": false,
Expand All @@ -179,35 +187,99 @@
"custom_config": {}
},
{
"name": "repo_git_token_secret_name",
"name": "force_create_standard_api_key",
"required": false,
"type": "boolean",
"hidden": false,
"default": false,
"custom_config": {}
},
{
"name": "custom_app_repo_git_token_secret_name",
"required": false,
"type": "string",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "repo_git_token_secret_value",
"name": "custom_app_repo_git_token_secret_value",
"required": false,
"type": "password",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "repo_group",
"name": "custom_app_repo_group",
"required": false,
"type": "string",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "custom_app_repo_git_provider",
"required": false,
"type": "string",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "custom_app_repo_git_id",
"required": false,
"type": "string",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "custom_app_repo_title",
"required": false,
"type": "string",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "create_icr_namespace",
"name": "custom_app_repo_root_url",
"required": false,
"type": "string",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "custom_app_repo_blind_connection",
"required": false,
"type": "boolean",
"hidden": false,
"default": true,
"default": false,
"custom_config": {}
},
{
"name": "repo_git_token_secret_name",
"required": false,
"type": "string",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "repo_git_token_secret_value",
"required": false,
"type": "password",
"hidden": false,
"default": "",
"custom_config": {}
},
{
"name": "repo_group",
"required": false,
"type": "string",
"hidden": false,
"default": "",
"custom_config": {}
},
{
Expand Down Expand Up @@ -604,7 +676,7 @@
},
{
"name": "8 - DevSecOps Toolchains",
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.1f5e0b6e-e03f-4988-8fba-6810ed59de29-global",
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.3c90d957-c25c-4557-add9-119ab5fabc29-global",
"inputs": [
{
"name": "ibmcloud_api_key",
Expand Down Expand Up @@ -722,6 +794,42 @@
"name": "create_git_token",
"value": "ref:../../inputs/create_git_token"
},
{
"name": "force_create_standard_api_key",
"value": "ref:../../inputs/force_create_standard_api_key"
},
{
"name": "custom_app_repo_git_token_secret_name",
"value": "ref:../../inputs/custom_app_repo_git_token_secret_name"
},
{
"name": "custom_app_repo_git_token_secret_value",
"value": "ref:../../inputs/custom_app_repo_git_token_secret_value"
},
{
"name": "custom_app_repo_group",
"value": "ref:../../inputs/custom_app_repo_group"
},
{
"name": "custom_app_repo_git_provider",
"value": "ref:../../inputs/custom_app_repo_git_provider"
},
{
"name": "custom_app_repo_git_id",
"value": "ref:../../inputs/custom_app_repo_git_id"
},
{
"name": "custom_app_repo_title",
"value": "ref:../../inputs/custom_app_repo_title"
},
{
"name": "custom_app_repo_root_url",
"value": "ref:../../inputs/custom_app_repo_root_url"
},
{
"name": "custom_app_repo_blind_connection",
"value": "ref:../../inputs/custom_app_repo_blind_connection"
},
{
"name": "repo_git_token_secret_name",
"value": "ref:../../inputs/repo_git_token_secret_name"
Expand Down