Skip to content

Add code engine da #41

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 7 commits into from
Sep 3, 2024
Merged

Add code engine da #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
90f690a
chore:add code engine da
padraic-edwards Aug 22, 2024
e62181f
chore: update code engine da
padraic-edwards Aug 28, 2024
f818ce7
chore: update scc version
padraic-edwards Aug 29, 2024
1125d3d
Merge branch 'main' into addCodeEngineDA
padraic-edwards Sep 3, 2024
dc7a3e1
chore: remove var
padraic-edwards Sep 3, 2024
f7e3ba4
chore: fix brackets
padraic-edwards Sep 3, 2024
0697679
chore: update code engine da inputs
padraic-edwards Sep 3, 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
9 changes: 8 additions & 1 deletion ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,16 @@
{
"key": "use_existing_resource_group",
"type": "boolean",
"default_value": true,
"default_value": false,
"description": "Setting to `true` will treat the `resource_group_name` as an existing resource group. Setting `false` will provision a new resource group based on the value in `resource_group_name`.",
"required": true
},
{
"key": "project_names",
"required": false,
"type": "array",
"default_value": "[\"CI_Project\", \"CD_Project\"]",
"description": "The names of the projects to add the IBM Cloud Code Engine."
}
],
"outputs": [
Expand Down
62 changes: 31 additions & 31 deletions kubernetes/stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,14 +199,14 @@
"value": "ref:../../inputs/prefix"
}
],
"name": "1a - Key Management",
"name": "1 - Key Management",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.650ff7c9-5a41-4d32-a0db-6720ff56a016-global"
},
{
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1a - Key Management/outputs/resource_group_name"
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "existing_resource_group",
Expand All @@ -221,7 +221,7 @@
"value": "ref:../../inputs/prefix"
}
],
"name": "1b- Cloud Object Storage",
"name": "2 - Cloud Object Storage",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.75709d42-41a3-41ca-8f45-807652f0d1f7-global"
},
{
Expand All @@ -236,45 +236,45 @@
},
{
"name": "existing_cos_instance_id",
"value": "ref:../../members/1b- Cloud Object Storage/outputs/cos_instance_id"
"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn"
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
},
{
"name": "skip_iam_authorization_policy",
"value": false
}
],
"name": "2 - Cloud Object Bucket",
"name": "3 - Cloud Object Storage",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1218c52a-4c9c-433a-817d-ae2f0cdc8be4-global"
},
{
"inputs": [
{
"name": "existing_cos_instance_crn",
"value": "ref:../../members/2 - Cloud Object Bucket/outputs/cos_instance_id"
"value": "ref:../../members/3 - Cloud Object Storage/outputs/cos_instance_id"
},
{
"name": "kms_endpoint_url",
"value": "ref:../../members/1a - Key Management/outputs/kms_private_endpoint"
"value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint"
},
{
"name": "skip_cos_kms_auth_policy",
"value": true
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn"
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
},
{
"name": "kms_endpoint_type",
"value": "private"
},
{
"name": "resource_group_name",
"value": "ref:../../members/1a - Key Management/outputs/resource_group_name"
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
Expand All @@ -285,14 +285,14 @@
"value": "ref:../../inputs/en_region"
}
],
"name": "3 - Event Notifications",
"name": "4 - Event Notifications",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3910e11e-c90b-48b0-b271-ec5d5049ad84-global"
},
{
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1a - Key Management/outputs/resource_group_name"
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
Expand All @@ -308,25 +308,25 @@
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn"
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
},
{
"name": "existing_event_notification_instance_crn",
"value": "ref:../../members/3 - Event Notifications/outputs/crn"
"value": "ref:../../members/4 - Event Notifications/outputs/crn"
},
{
"name": "service_plan",
"value": "ref:../../inputs/sm_service_plan"
}
],
"name": "4 - Secrets Manager",
"name": "5 - Secrets Manager",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e806bb05-dfb9-40a8-99bf-1b9272cf8d82-global"
},
{
"inputs": [
{
"name": "resource_group_name",
"value": "ref:../../members/1a - Key Management/outputs/resource_group_name"
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
Expand All @@ -346,11 +346,11 @@
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1a - Key Management/outputs/kms_instance_crn"
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
},
{
"name": "existing_en_crn",
"value": "ref:../../members/3 - Event Notifications/outputs/crn"
"value": "ref:../../members/4 - Event Notifications/outputs/crn"
},
{
"name": "kms_endpoint_type",
Expand All @@ -366,18 +366,18 @@
},
{
"name": "existing_cos_instance_crn",
"value": "ref:../../members/1b- Cloud Object Storage/outputs/cos_instance_id"
"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
},
{
"name" : "provision_scc_workload_protection",
"value" : false
}
],
"name": "5 - Security and Compliance Center",
"name": "6 - Security and Compliance Center",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1ac9df0e-d3d5-4ed8-abfc-043578670dbb-global"
},
{
"name": "6 - DevSecOps Toolchains",
"name": "7 - DevSecOps Toolchains",
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.9c2038e5-76ce-4b7f-8862-3e451f8392ef-global",
"inputs": [
{
Expand All @@ -390,39 +390,39 @@
},
{
"name": "toolchain_resource_group",
"value": "ref:../../members/5 - Security and Compliance Center/outputs/resource_group_name"
"value": "ref:../../members/6 - Security and Compliance Center/outputs/resource_group_name"
},
{
"name": "sm_secret_group",
"value": "ref:../../inputs/sm_secret_group"
},
{
"name": "sm_resource_group",
"value": "ref:../../members/4 - Secrets Manager/outputs/resource_group_name"
"value": "ref:../../members/5 - Secrets Manager/outputs/resource_group_name"
},
{
"name": "sm_name",
"value": "ref:../../members/4 - Secrets Manager/outputs/secrets_manager_name"
"value": "ref:../../members/5 - Secrets Manager/outputs/secrets_manager_name"
},
{
"name": "sm_location",
"value": "ref:../../members/4 - Secrets Manager/outputs/secrets_manager_region"
"value": "ref:../../members/5 - Secrets Manager/outputs/secrets_manager_region"
},
{
"name": "repositories_prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "event_notifications_crn",
"value": "ref:../../members/3 - Event Notifications/outputs/crn"
"value": "ref:../../members/4 - Event Notifications/outputs/crn"
},
{
"name" : "cos_bucket_name",
"value" : "ref:../../members/2 - Cloud Object Bucket/outputs/bucket_name"
"value" : "ref:../../members/3 - Cloud Object Storage/outputs/bucket_name"
},
{
"name" : "cos_endpoint",
"value" : "ref:../../members/2 - Cloud Object Bucket/outputs/s3_endpoint_direct"
"value" : "ref:../../members/3 - Cloud Object Storage/outputs/s3_endpoint_direct"
},
{
"name" : "registry_namespace",
Expand Down Expand Up @@ -519,15 +519,15 @@
"outputs": [
{
"name": "compliance-ci-toolchain",
"value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_ci_toolchain_url"
"value": "ref:./members/7 - DevSecOps Toolchains/outputs/compliance_ci_toolchain_url"
},
{
"name": "compliance-cd-toolchain",
"value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_cd_toolchain_url"
"value": "ref:./members/7 - DevSecOps Toolchains/outputs/compliance_cd_toolchain_url"
},
{
"name": "compliance-cc-toolchain",
"value": "ref:./members/6 - DevSecOps Toolchains/outputs/compliance_cc_toolchain_url"
"value": "ref:./members/7 - DevSecOps Toolchains/outputs/compliance_cc_toolchain_url"
}
]
}
Loading