Skip to content

Commit b8c4a28

Browse files
huayuenhhuayuenh
committed
feat: add app, deployment, config independent airgap support
1 parent 0ce8a51 commit b8c4a28

File tree

3 files changed

+8
-179
lines changed

3 files changed

+8
-179
lines changed

‎ibm_catalog.json‎

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -717,13 +717,6 @@
717717
"required": false
718718
},
719719
{
720-
"key": "force_create_standard_api_key",
721-
"type": "boolean",
722-
"default_value": false,
723-
"description": "Set to `true` to force create a standard api key. By default the generated apikey will be a service api key. It is recommended to use a Git Token when using the service api key. In the case where the user has been invited to an account and that user not the account owner, during toolchain creation the default compliance repositories will be created in that user's account and the service api will not have access to those repositories. In this case a Git Token for the repositories is required. See `repo_git_token_secret_name` for more details. The alternative is to set `force_create_standard_api_key` to `true` to create a standard api key.",
724-
"required": false
725-
},
726-
{
727720
"key": "pipeline_ibmcloud_api_key_secret_name",
728721
"type": "string",
729722
"default_value": "ibmcloud-api-key",
@@ -886,62 +879,6 @@
886879
"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`."
887880
},
888881
{
889-
"key": "custom_app_repo_title",
890-
"type": "string",
891-
"default_value": "",
892-
"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.",
893-
"required": false
894-
},
895-
{
896-
"key": "custom_app_repo_root_url",
897-
"type": "string",
898-
"default_value": "",
899-
"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.",
900-
"required": false
901-
},
902-
{
903-
"key": "custom_app_repo_blind_connection",
904-
"type": "string",
905-
"default_value": "false",
906-
"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.",
907-
"required": false
908-
},
909-
{
910-
"key": "custom_app_repo_git_id",
911-
"type": "string",
912-
"default_value": "",
913-
"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`.",
914-
"required": false
915-
},
916-
{
917-
"key": "custom_app_repo_group",
918-
"type": "string",
919-
"default_value": "",
920-
"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`.",
921-
"required": false
922-
},
923-
{
924-
"key": "custom_app_repo_git_provider",
925-
"type": "string",
926-
"default_value": "",
927-
"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`.",
928-
"required": false
929-
},
930-
{
931-
"key": "custom_app_repo_git_token_secret_name",
932-
"type": "string",
933-
"default_value": "",
934-
"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`.",
935-
"required": false
936-
},
937-
{
938-
"key": "custom_app_repo_git_token_secret_value",
939-
"type": "password",
940-
"default_value": "",
941-
"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.",
942-
"required": false
943-
},
944-
{
945882
"key": "repo_git_token_secret_name",
946883
"required": false,
947884
"type": "string",

‎kubernetes/stack_definition.json‎

Lines changed: 7 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,6 @@
215215
"default": false,
216216
"custom_config": {}
217217
},
218-
{
219-
"name": "create_icr_namespace",
220-
"required": false,
221-
"type": "boolean",
222-
"hidden": false,
223-
"default": true,
224-
"custom_config": {}
225-
},
226218
{
227219
"name": "create_git_token",
228220
"required": false,
@@ -232,99 +224,35 @@
232224
"custom_config": {}
233225
},
234226
{
235-
"name": "force_create_standard_api_key",
236-
"required": false,
237-
"type": "boolean",
238-
"hidden": false,
239-
"default": false,
240-
"custom_config": {}
241-
},
242-
{
243-
"name": "custom_app_repo_git_token_secret_name",
227+
"name": "repo_git_token_secret_name",
244228
"required": false,
245229
"type": "string",
246230
"hidden": false,
247231
"default": "",
248232
"custom_config": {}
249233
},
250-
{
251-
"name": "custom_app_repo_git_token_secret_value",
234+
{
235+
"name": "repo_git_token_secret_value",
252236
"required": false,
253237
"type": "password",
254238
"hidden": false,
255239
"default": "",
256240
"custom_config": {}
257241
},
258-
{
259-
"name": "custom_app_repo_group",
260-
"required": false,
261-
"type": "string",
262-
"hidden": false,
263-
"default": "",
264-
"custom_config": {}
265-
},
266-
{
267-
"name": "custom_app_repo_git_provider",
268-
"required": false,
269-
"type": "string",
270-
"hidden": false,
271-
"default": "",
272-
"custom_config": {}
273-
},
274-
{
275-
"name": "custom_app_repo_git_id",
276-
"required": false,
277-
"type": "string",
278-
"hidden": false,
279-
"default": "",
280-
"custom_config": {}
281-
},
282-
{
283-
"name": "custom_app_repo_title",
284-
"required": false,
285-
"type": "string",
286-
"hidden": false,
287-
"default": "",
288-
"custom_config": {}
289-
},
290242
{
291-
"name": "custom_app_repo_root_url",
243+
"name": "repo_group",
292244
"required": false,
293245
"type": "string",
294246
"hidden": false,
295247
"default": "",
296248
"custom_config": {}
297249
},
298250
{
299-
"name": "custom_app_repo_blind_connection",
251+
"name": "create_icr_namespace",
300252
"required": false,
301253
"type": "boolean",
302254
"hidden": false,
303-
"default": false,
304-
"custom_config": {}
305-
},
306-
{
307-
"name": "repo_git_token_secret_name",
308-
"required": false,
309-
"type": "string",
310-
"hidden": false,
311-
"default": "",
312-
"custom_config": {}
313-
},
314-
{
315-
"name": "repo_git_token_secret_value",
316-
"required": false,
317-
"type": "password",
318-
"hidden": false,
319-
"default": "",
320-
"custom_config": {}
321-
},
322-
{
323-
"name": "repo_group",
324-
"required": false,
325-
"type": "string",
326-
"hidden": false,
327-
"default": "",
255+
"default": true,
328256
"custom_config": {}
329257
},
330258
{
@@ -699,7 +627,7 @@
699627
},
700628
{
701629
"name": "7 - DevSecOps Toolchains",
702-
"version_locator": "052cba69-29c3-4c01-bf93-40fd943dc34f.febc4131-74d8-494b-8045-4bdb629d5b0a",
630+
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.1f5e0b6e-e03f-4988-8fba-6810ed59de29-global",
703631
"inputs": [
704632
{
705633
"name": "ibmcloud_api_key",
@@ -833,42 +761,6 @@
833761
"name": "create_git_token",
834762
"value": "ref:../../inputs/create_git_token"
835763
},
836-
{
837-
"name": "force_create_standard_api_key",
838-
"value": "ref:../../inputs/force_create_standard_api_key"
839-
},
840-
{
841-
"name": "custom_app_repo_git_token_secret_name",
842-
"value": "ref:../../inputs/custom_app_repo_git_token_secret_name"
843-
},
844-
{
845-
"name": "custom_app_repo_git_token_secret_value",
846-
"value": "ref:../../inputs/custom_app_repo_git_token_secret_value"
847-
},
848-
{
849-
"name": "custom_app_repo_group",
850-
"value": "ref:../../inputs/custom_app_repo_group"
851-
},
852-
{
853-
"name": "custom_app_repo_git_provider",
854-
"value": "ref:../../inputs/custom_app_repo_git_provider"
855-
},
856-
{
857-
"name": "custom_app_repo_git_id",
858-
"value": "ref:../../inputs/custom_app_repo_git_id"
859-
},
860-
{
861-
"name": "custom_app_repo_title",
862-
"value": "ref:../../inputs/custom_app_repo_title"
863-
},
864-
{
865-
"name": "custom_app_repo_root_url",
866-
"value": "ref:../../inputs/custom_app_repo_root_url"
867-
},
868-
{
869-
"name": "custom_app_repo_blind_connection",
870-
"value": "ref:../../inputs/custom_app_repo_blind_connection"
871-
},
872764
{
873765
"name": "repo_git_token_secret_name",
874766
"value": "ref:../../inputs/repo_git_token_secret_name"

‎stack_definition.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@
676676
},
677677
{
678678
"name": "8 - DevSecOps Toolchains",
679-
"version_locator": "052cba69-29c3-4c01-bf93-40fd943dc34f.d38264f1-6412-4787-b511-3831dcd3efb9",
679+
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.3c90d957-c25c-4557-add9-119ab5fabc29-global",
680680
"inputs": [
681681
{
682682
"name": "ibmcloud_api_key",

0 commit comments

Comments
 (0)