Skip to content

Commit 5f58b51

Browse files
huayuenhhuayuenh
authored
fix: airgap support (#105)
* fix: references * fix: add missing cos crn inputs
1 parent 24154ab commit 5f58b51

File tree

3 files changed

+345
-343
lines changed

3 files changed

+345
-343
lines changed

‎ibm_catalog.json

Lines changed: 76 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,20 @@
151151
"description": "Set to `true` to create a Continuous Delivery Service. This is required for running the DevSecOps toolchain pipelines and to successfuly interact with a DevOps Insights integration.",
152152
"required": false
153153
},
154+
{
155+
"key": "project_ci_name",
156+
"required": false,
157+
"type": "string",
158+
"default_value": "CI_Project",
159+
"description": "The name of the IBM Cloud Code Engine CI project."
160+
},
161+
{
162+
"key": "project_cd_name",
163+
"required": false,
164+
"type": "string",
165+
"default_value": "CD_Project",
166+
"description": "The name of the IBM Cloud Code Engine CD project."
167+
},
154168
{
155169
"key": "pipeline_ibmcloud_api_key_secret_name",
156170
"type": "string",
@@ -292,13 +306,6 @@
292306
"description": "Name of the Git token secret in the secret provider used for accessing the sample (or bring your own) application repository.",
293307
"required": false
294308
},
295-
{
296-
"key": "project_names",
297-
"required": false,
298-
"type": "array",
299-
"default_value": ["CI_Project", "CD_Project"],
300-
"description": "The names of the projects to add the IBM Cloud Code Engine."
301-
},
302309
{
303310
"key": "existing_secrets_manager_crn",
304311
"required": false,
@@ -307,75 +314,19 @@
307314
"description": "The CRN of an existing Secrets Manager instance"
308315
},
309316
{
310-
"key": "autostart",
311-
"required": false,
312-
"type": "boolean",
313-
"default_value": false,
314-
"description": "Set to `true` to automatically run the CI pipeline."
315-
},
317+
"key": "force_create_standard_api_key",
318+
"type": "boolean",
319+
"default_value": false,
320+
"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.",
321+
"required": false
322+
},
316323
{
317324
"key": "create_git_token",
318325
"required": false,
319326
"type": "boolean",
320327
"default_value": false,
321328
"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`."
322329
},
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-
},
379330
{
380331
"key": "repo_git_token_secret_name",
381332
"required": false,
@@ -397,6 +348,13 @@
397348
"default_value": "",
398349
"description": "The name of the Git repository owner/group. This setting applies to all all the compliance repositories and sample app."
399350
},
351+
{
352+
"key": "repo_apply_settings_to_compliance_repos",
353+
"type": "boolean",
354+
"default_value": true,
355+
"description": "Set to `true` to apply the same settings to all the default compliance repositories. Set to `false` to apply these settings to only the sample application, pipeline config and the deployment repositories.",
356+
"required": false
357+
},
400358
{
401359
"key": "repo_git_provider",
402360
"type": "string",
@@ -542,6 +500,20 @@
542500
"type": "password",
543501
"description": "The private worker service api key that will be added to the `privateworker_credentials_secret_name` secret in the secrets provider.",
544502
"required": false
503+
},
504+
{
505+
"key": "toolchain_access_group_name",
506+
"type": "string",
507+
"default_value": "devsecops-toolchain",
508+
"description": "The name of the DevSecOps access group that is created.",
509+
"required": false
510+
},
511+
{
512+
"key": "use_legacy_ref",
513+
"type": "boolean",
514+
"default_value": true,
515+
"description": "Set to `true` to use the legacy secret reference format for Secrets Manager secrets.",
516+
"required": false
545517
}
546518
],
547519
"outputs": [
@@ -625,13 +597,6 @@
625597
}
626598
}
627599
},
628-
{
629-
"key": "cluster_name",
630-
"type": "string",
631-
"default_value": "mycluster",
632-
"description": "The name of cluster. Treats the dev and prod cluster as the same cluster.",
633-
"required": true
634-
},
635600
{
636601
"key": "prefix",
637602
"type": "string",
@@ -674,6 +639,13 @@
674639
"description": "Set to `true` to create a Continuous Delivery Service. This is required for running the DevSecOps toolchain pipelines and to successfuly interact with a DevOps Insights integration.",
675640
"required": false
676641
},
642+
{
643+
"key": "cluster_name",
644+
"type": "string",
645+
"default_value": "mycluster",
646+
"description": "The name of cluster. Treats the dev and prod cluster as the same cluster.",
647+
"required": true
648+
},
677649
{
678650
"key": "ci_cluster_name",
679651
"type": "string",
@@ -712,7 +684,7 @@
712684
{
713685
"key": "cd_cluster_namespace",
714686
"type": "string",
715-
"default_value": "dev",
687+
"default_value": "prod",
716688
"description": "The name of production cluster namespace.",
717689
"required": false
718690
},
@@ -865,12 +837,12 @@
865837
"description": "The CRN of an existing Secrets Manager instance"
866838
},
867839
{
868-
"key": "autostart",
869-
"required": false,
870-
"type": "boolean",
871-
"default_value": false,
872-
"description": "Set to `true` to automatically run the CI pipeline."
873-
},
840+
"key": "force_create_standard_api_key",
841+
"type": "boolean",
842+
"default_value": false,
843+
"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.",
844+
"required": false
845+
},
874846
{
875847
"key": "create_git_token",
876848
"required": false,
@@ -900,6 +872,13 @@
900872
"description": "The name of the Git repository owner/group. This setting applies to all all the compliance repositories and sample app."
901873
},
902874
{
875+
"key": "repo_apply_settings_to_compliance_repos",
876+
"type": "boolean",
877+
"default_value": true,
878+
"description": "Set to `true` to apply the same settings to all the default compliance repositories. Set to `false` to apply these settings to only the sample application, pipeline config and the deployment repositories.",
879+
"required": false
880+
},
881+
{
903882
"key": "repo_git_provider",
904883
"type": "string",
905884
"default_value": "",
@@ -1044,6 +1023,20 @@
10441023
"type": "password",
10451024
"description": "The private worker service api key that will be added to the `privateworker_credentials_secret_name` secret in the secrets provider.",
10461025
"required": false
1026+
},
1027+
{
1028+
"key": "toolchain_access_group_name",
1029+
"type": "string",
1030+
"default_value": "devsecops-toolchain",
1031+
"description": "The name of the DevSecOps access group that is created.",
1032+
"required": false
1033+
},
1034+
{
1035+
"key": "use_legacy_ref",
1036+
"type": "boolean",
1037+
"default_value": true,
1038+
"description": "Set to `true` to use the legacy secret reference format for Secrets Manager secrets.",
1039+
"required": false
10471040
}
10481041
],
10491042
"outputs": [

0 commit comments

Comments
 (0)