Skip to content

Replace Code Engine DA and add ICR DA + Logs Agent DA #267

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
ocofaigh merged 6 commits into from
Nov 17, 2025
Merged

Replace Code Engine DA and add ICR DA + Logs Agent DA #267

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83c7286
replace CE DA and add ICR DA
ocofaigh Nov 11, 2025
670f513
add logs agent
ocofaigh Nov 11, 2025
c31d39e
remove compliance claim
ocofaigh Nov 12, 2025
cf700c6
Merge branch 'main' into replace-da
ocofaigh Nov 14, 2025
791b4a5
test: use us-south instead
ocofaigh Nov 14, 2025
c97fdfa
Merge branch 'main' into replace-da
ocofaigh Nov 16, 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
2 changes: 2 additions & 0 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"index": 1,
"working_directory": "solutions/basic",
"ignore_readme": true,
"dependency_version_2": true,
"compliance": {
"authority": "scc-v3",
"profiles": [
Expand Down Expand Up @@ -616,6 +617,7 @@
"index": 2,
"working_directory": "solutions/standard",
"ignore_readme": true,
"dependency_version_2": true,
"compliance": {
"authority": "scc-v3",
"profiles": [
Expand Down
44 changes: 33 additions & 11 deletions solutions/basic/stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
},
{
"name": "2d - Workload - Code Engine Project for CI",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.879ff223-c2d9-486c-b7b6-62dbc3083a0d-global",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8f2dddee-2211-4330-bd2d-74c84a72601d-global",
"inputs": [
{
"name": "existing_resource_group_name",
Expand All @@ -307,7 +307,7 @@
"value": "ref:../../inputs/prefix"
},
{
"name": "project_name",
"name": "code_engine_project_name",
"value": "Generative_AI_Sample_App_CI_Project"
},
{
Expand All @@ -318,7 +318,7 @@
},
{
"name": "2e - Workload - Code Engine Project for CD",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.879ff223-c2d9-486c-b7b6-62dbc3083a0d-global",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8f2dddee-2211-4330-bd2d-74c84a72601d-global",
"inputs": [
{
"name": "existing_resource_group_name",
Expand All @@ -329,7 +329,7 @@
"value": "ref:../../inputs/prefix"
},
{
"name": "project_name",
"name": "code_engine_project_name",
"value": "Generative_AI_Sample_App_CD_Project"
},
{
Expand All @@ -338,6 +338,28 @@
}
]
},
{
"name": "2f - Workload - Container Registry",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4ddd4d03-09ea-45c0-a591-53dbbed95eeb-global",
"inputs": [
{
"name": "existing_resource_group_name",
"value": "ref:../1 - Account Configuration/outputs/workload_resource_group_name"
},
{
"name": "prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "namespace_name",
"value": "ref:../../inputs/region"
},
{
"name": "upgrade_to_standard_plan",
"value": true
}
]
},
{
"name": "3a - Essential Security - Event Notifications",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29f017cd-7a6f-45cc-a4ed-5f23505380bf-global",
Expand Down Expand Up @@ -808,19 +830,15 @@
},
{
"name": "ci_code_engine_project",
"value": "ref:../2d - Workload - Code Engine Project for CI/outputs/project_name"
"value": "ref:../2d - Workload - Code Engine Project for CI/outputs/code_engine_project_name"
},
{
"name": "use_legacy_ref",
"value": false
},
{
"name": "cd_code_engine_project",
"value": "ref:../2e - Workload - Code Engine Project for CD/outputs/project_name"
},
{
"name": "registry_namespace",
"value": "rag-app"
"value": "ref:../2e - Workload - Code Engine Project for CD/outputs/code_engine_project_name"
},
{
"name": "app_repo_clone_from_url",
Expand Down Expand Up @@ -860,7 +878,11 @@
},
{
"name": "create_icr_namespace",
"value": true
"value": false
},
{
"name": "registry_namespace",
"value": "ref:../2f - Workload - Container Registry/outputs/namespace_name"
},
{
"name": "add_container_name_suffix",
Expand Down
54 changes: 49 additions & 5 deletions solutions/standard/stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,28 @@
}
]
},
{
"name": "2d - Workload - Container Registry",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4ddd4d03-09ea-45c0-a591-53dbbed95eeb-global",
"inputs": [
{
"name": "existing_resource_group_name",
"value": "ref:../1 - Account Configuration/outputs/workload_resource_group_name"
},
{
"name": "prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "namespace_name",
"value": "ref:../../inputs/region"
},
{
"name": "upgrade_to_standard_plan",
"value": true
}
]
},
{
"name": "3a - Essential Security - Event Notifications",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29f017cd-7a6f-45cc-a4ed-5f23505380bf-global",
Expand Down Expand Up @@ -837,10 +859,6 @@
"name": "cluster_name",
"value": "ref:../3c - Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name"
},
{
"name": "registry_namespace",
"value": "rag-app"
},
{
"name": "app_repo_clone_from_url",
"value": "ref:../../inputs/sample_app_git_url"
Expand Down Expand Up @@ -875,7 +893,11 @@
},
{
"name": "create_icr_namespace",
"value": true
"value": false
},
{
"name": "registry_namespace",
"value": "ref:../2d - Workload - Container Registry/outputs/namespace_name"
},
{
"name": "add_container_name_suffix",
Expand Down Expand Up @@ -933,6 +955,28 @@
}
]
},
{
"name": "5e - Workload Essential Security - Red Hat OpenShift logging agent",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6a32a898-804a-4e6f-833d-0dde755e1261-global",
"inputs": [
{
"name": "prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "cluster_id",
"value": "ref:./members/3c - Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_id"
},
{
"name": "cluster_resource_group_id",
"value": "ref:./members/3c - Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_rg_id"
},
{
"name": "cloud_logs_ingress_endpoint",
"value": "ref:./members/4a - Essential Security - Cloud Logs for logging/outputs/cloud_logs_ingress_private_endpoint"
}
]
},
{
"name": "6 - Workload - Sample RAG Application",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e7af3542-6a4a-44fe-b646-2598bb925719-global",
Expand Down