Skip to content

Commit 6409cd1

Browse files
huayuenhhuayuenh
authored
feat: app, deployment, config repo airgap support (#98)
1 parent 4ccbd9a commit 6409cd1

File tree

2 files changed

+171
-7
lines changed

2 files changed

+171
-7
lines changed

‎ibm_catalog.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,62 @@
320320
"default_value": false,
321321
"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`."
322322
},
323+
{
324+
"key": "custom_app_repo_title",
325+
"type": "string",
326+
"default_value": "",
327+
"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.",
328+
"required": false
329+
},
330+
{
331+
"key": "custom_app_repo_root_url",
332+
"type": "string",
333+
"default_value": "",
334+
"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.",
335+
"required": false
336+
},
337+
{
338+
"key": "custom_app_repo_blind_connection",
339+
"type": "string",
340+
"default_value": "false",
341+
"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.",
342+
"required": false
343+
},
344+
{
345+
"key": "custom_app_repo_git_id",
346+
"type": "string",
347+
"default_value": "",
348+
"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`.",
349+
"required": false
350+
},
351+
{
352+
"key": "custom_app_repo_group",
353+
"type": "string",
354+
"default_value": "",
355+
"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`.",
356+
"required": false
357+
},
358+
{
359+
"key": "custom_app_repo_git_provider",
360+
"type": "string",
361+
"default_value": "",
362+
"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`.",
363+
"required": false
364+
},
365+
{
366+
"key": "custom_app_repo_git_token_secret_name",
367+
"type": "string",
368+
"default_value": "",
369+
"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`.",
370+
"required": false
371+
},
372+
{
373+
"key": "custom_app_repo_git_token_secret_value",
374+
"type": "password",
375+
"default_value": "",
376+
"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.",
377+
"required": false
378+
},
323379
{
324380
"key": "repo_git_token_secret_name",
325381
"required": false,

‎stack_definition.json

Lines changed: 115 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,14 @@
170170
"default": false,
171171
"custom_config": {}
172172
},
173+
{
174+
"name": "create_icr_namespace",
175+
"required": false,
176+
"type": "boolean",
177+
"hidden": false,
178+
"default": true,
179+
"custom_config": {}
180+
},
173181
{
174182
"name": "create_git_token",
175183
"required": false,
@@ -179,35 +187,99 @@
179187
"custom_config": {}
180188
},
181189
{
182-
"name": "repo_git_token_secret_name",
190+
"name": "force_create_standard_api_key",
191+
"required": false,
192+
"type": "boolean",
193+
"hidden": false,
194+
"default": false,
195+
"custom_config": {}
196+
},
197+
{
198+
"name": "custom_app_repo_git_token_secret_name",
183199
"required": false,
184200
"type": "string",
185201
"hidden": false,
186202
"default": "",
187203
"custom_config": {}
188204
},
189205
{
190-
"name": "repo_git_token_secret_value",
206+
"name": "custom_app_repo_git_token_secret_value",
191207
"required": false,
192208
"type": "password",
193209
"hidden": false,
194210
"default": "",
195211
"custom_config": {}
196212
},
197213
{
198-
"name": "repo_group",
214+
"name": "custom_app_repo_group",
215+
"required": false,
216+
"type": "string",
217+
"hidden": false,
218+
"default": "",
219+
"custom_config": {}
220+
},
221+
{
222+
"name": "custom_app_repo_git_provider",
223+
"required": false,
224+
"type": "string",
225+
"hidden": false,
226+
"default": "",
227+
"custom_config": {}
228+
},
229+
{
230+
"name": "custom_app_repo_git_id",
231+
"required": false,
232+
"type": "string",
233+
"hidden": false,
234+
"default": "",
235+
"custom_config": {}
236+
},
237+
{
238+
"name": "custom_app_repo_title",
199239
"required": false,
200240
"type": "string",
201241
"hidden": false,
202242
"default": "",
203243
"custom_config": {}
204244
},
205245
{
206-
"name": "create_icr_namespace",
246+
"name": "custom_app_repo_root_url",
207247
"required": false,
208-
"type": "boolean",
248+
"type": "string",
209249
"hidden": false,
210-
"default": true,
250+
"default": "",
251+
"custom_config": {}
252+
},
253+
{
254+
"name": "custom_app_repo_blind_connection",
255+
"required": false,
256+
"type": "string",
257+
"hidden": false,
258+
"default": "false",
259+
"custom_config": {}
260+
},
261+
{
262+
"name": "repo_git_token_secret_name",
263+
"required": false,
264+
"type": "string",
265+
"hidden": false,
266+
"default": "",
267+
"custom_config": {}
268+
},
269+
{
270+
"name": "repo_git_token_secret_value",
271+
"required": false,
272+
"type": "password",
273+
"hidden": false,
274+
"default": "",
275+
"custom_config": {}
276+
},
277+
{
278+
"name": "repo_group",
279+
"required": false,
280+
"type": "string",
281+
"hidden": false,
282+
"default": "",
211283
"custom_config": {}
212284
},
213285
{
@@ -604,7 +676,7 @@
604676
},
605677
{
606678
"name": "8 - DevSecOps Toolchains",
607-
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.1f5e0b6e-e03f-4988-8fba-6810ed59de29-global",
679+
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.3c90d957-c25c-4557-add9-119ab5fabc29-global",
608680
"inputs": [
609681
{
610682
"name": "ibmcloud_api_key",
@@ -722,6 +794,42 @@
722794
"name": "create_git_token",
723795
"value": "ref:../../inputs/create_git_token"
724796
},
797+
{
798+
"name": "force_create_standard_api_key",
799+
"value": "ref:../../inputs/force_create_standard_api_key"
800+
},
801+
{
802+
"name": "custom_app_repo_git_token_secret_name",
803+
"value": "ref:../../inputs/custom_app_repo_git_token_secret_name"
804+
},
805+
{
806+
"name": "custom_app_repo_git_token_secret_value",
807+
"value": "ref:../../inputs/custom_app_repo_git_token_secret_value"
808+
},
809+
{
810+
"name": "custom_app_repo_group",
811+
"value": "ref:../../inputs/custom_app_repo_group"
812+
},
813+
{
814+
"name": "custom_app_repo_git_provider",
815+
"value": "ref:../../inputs/custom_app_repo_git_provider"
816+
},
817+
{
818+
"name": "custom_app_repo_git_id",
819+
"value": "ref:../../inputs/custom_app_repo_git_id"
820+
},
821+
{
822+
"name": "custom_app_repo_title",
823+
"value": "ref:../../inputs/custom_app_repo_title"
824+
},
825+
{
826+
"name": "custom_app_repo_root_url",
827+
"value": "ref:../../inputs/custom_app_repo_root_url"
828+
},
829+
{
830+
"name": "custom_app_repo_blind_connection",
831+
"value": "ref:../../inputs/custom_app_repo_blind_connection"
832+
},
725833
{
726834
"name": "repo_git_token_secret_name",
727835
"value": "ref:../../inputs/repo_git_token_secret_name"

0 commit comments

Comments
 (0)