Skip to content

Commit 0eb9e67

Browse files
ocofaighocofaigh
authored
feat: replace CE DA and add ICR DA (#267)
BREAKING CHANGE: No upgrade path
1 parent e045700 commit 0eb9e67

File tree

4 files changed

+86
-26
lines changed

4 files changed

+86
-26
lines changed

‎ibm_catalog.json‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
"index": 1,
6969
"working_directory": "solutions/basic",
7070
"ignore_readme": true,
71+
"dependency_version_2": true,
7172
"compliance": {
7273
"authority": "scc-v3",
7374
"profiles": [
@@ -616,15 +617,7 @@
616617
"index": 2,
617618
"working_directory": "solutions/standard",
618619
"ignore_readme": true,
619-
"compliance": {
620-
"authority": "scc-v3",
621-
"profiles": [
622-
{
623-
"profile_name": "AI Security Guardrails 2.0",
624-
"profile_version": "1.1.0"
625-
}
626-
]
627-
},
620+
"dependency_version_2": true,
628621
"iam_permissions": [
629622
{
630623
"service_name": "iam-groups",

‎solutions/basic/stack_definition.json‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
},
297297
{
298298
"name": "2d - Workload - Code Engine Project for CI",
299-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.879ff223-c2d9-486c-b7b6-62dbc3083a0d-global",
299+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8f2dddee-2211-4330-bd2d-74c84a72601d-global",
300300
"inputs": [
301301
{
302302
"name": "existing_resource_group_name",
@@ -307,7 +307,7 @@
307307
"value": "ref:../../inputs/prefix"
308308
},
309309
{
310-
"name": "project_name",
310+
"name": "code_engine_project_name",
311311
"value": "Generative_AI_Sample_App_CI_Project"
312312
},
313313
{
@@ -318,7 +318,7 @@
318318
},
319319
{
320320
"name": "2e - Workload - Code Engine Project for CD",
321-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.879ff223-c2d9-486c-b7b6-62dbc3083a0d-global",
321+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8f2dddee-2211-4330-bd2d-74c84a72601d-global",
322322
"inputs": [
323323
{
324324
"name": "existing_resource_group_name",
@@ -329,7 +329,7 @@
329329
"value": "ref:../../inputs/prefix"
330330
},
331331
{
332-
"name": "project_name",
332+
"name": "code_engine_project_name",
333333
"value": "Generative_AI_Sample_App_CD_Project"
334334
},
335335
{
@@ -338,6 +338,28 @@
338338
}
339339
]
340340
},
341+
{
342+
"name": "2f - Workload - Container Registry",
343+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4ddd4d03-09ea-45c0-a591-53dbbed95eeb-global",
344+
"inputs": [
345+
{
346+
"name": "existing_resource_group_name",
347+
"value": "ref:../1 - Account Configuration/outputs/workload_resource_group_name"
348+
},
349+
{
350+
"name": "prefix",
351+
"value": "ref:../../inputs/prefix"
352+
},
353+
{
354+
"name": "namespace_name",
355+
"value": "ref:../../inputs/region"
356+
},
357+
{
358+
"name": "upgrade_to_standard_plan",
359+
"value": true
360+
}
361+
]
362+
},
341363
{
342364
"name": "3a - Essential Security - Event Notifications",
343365
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29f017cd-7a6f-45cc-a4ed-5f23505380bf-global",
@@ -808,19 +830,15 @@
808830
},
809831
{
810832
"name": "ci_code_engine_project",
811-
"value": "ref:../2d - Workload - Code Engine Project for CI/outputs/project_name"
833+
"value": "ref:../2d - Workload - Code Engine Project for CI/outputs/code_engine_project_name"
812834
},
813835
{
814836
"name": "use_legacy_ref",
815837
"value": false
816838
},
817839
{
818840
"name": "cd_code_engine_project",
819-
"value": "ref:../2e - Workload - Code Engine Project for CD/outputs/project_name"
820-
},
821-
{
822-
"name": "registry_namespace",
823-
"value": "rag-app"
841+
"value": "ref:../2e - Workload - Code Engine Project for CD/outputs/code_engine_project_name"
824842
},
825843
{
826844
"name": "app_repo_clone_from_url",
@@ -860,7 +878,11 @@
860878
},
861879
{
862880
"name": "create_icr_namespace",
863-
"value": true
881+
"value": false
882+
},
883+
{
884+
"name": "registry_namespace",
885+
"value": "ref:../2f - Workload - Container Registry/outputs/namespace_name"
864886
},
865887
{
866888
"name": "add_container_name_suffix",

‎solutions/standard/stack_definition.json‎

Lines changed: 49 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,28 @@
294294
}
295295
]
296296
},
297+
{
298+
"name": "2d - Workload - Container Registry",
299+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4ddd4d03-09ea-45c0-a591-53dbbed95eeb-global",
300+
"inputs": [
301+
{
302+
"name": "existing_resource_group_name",
303+
"value": "ref:../1 - Account Configuration/outputs/workload_resource_group_name"
304+
},
305+
{
306+
"name": "prefix",
307+
"value": "ref:../../inputs/prefix"
308+
},
309+
{
310+
"name": "namespace_name",
311+
"value": "ref:../../inputs/region"
312+
},
313+
{
314+
"name": "upgrade_to_standard_plan",
315+
"value": true
316+
}
317+
]
318+
},
297319
{
298320
"name": "3a - Essential Security - Event Notifications",
299321
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.29f017cd-7a6f-45cc-a4ed-5f23505380bf-global",
@@ -837,10 +859,6 @@
837859
"name": "cluster_name",
838860
"value": "ref:../3c - Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name"
839861
},
840-
{
841-
"name": "registry_namespace",
842-
"value": "rag-app"
843-
},
844862
{
845863
"name": "app_repo_clone_from_url",
846864
"value": "ref:../../inputs/sample_app_git_url"
@@ -875,7 +893,11 @@
875893
},
876894
{
877895
"name": "create_icr_namespace",
878-
"value": true
896+
"value": false
897+
},
898+
{
899+
"name": "registry_namespace",
900+
"value": "ref:../2d - Workload - Container Registry/outputs/namespace_name"
879901
},
880902
{
881903
"name": "add_container_name_suffix",
@@ -933,6 +955,28 @@
933955
}
934956
]
935957
},
958+
{
959+
"name": "5e - Workload Essential Security - Red Hat OpenShift logging agent",
960+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6a32a898-804a-4e6f-833d-0dde755e1261-global",
961+
"inputs": [
962+
{
963+
"name": "prefix",
964+
"value": "ref:../../inputs/prefix"
965+
},
966+
{
967+
"name": "cluster_id",
968+
"value": "ref:./members/3c - Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_id"
969+
},
970+
{
971+
"name": "cluster_resource_group_id",
972+
"value": "ref:./members/3c - Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_rg_id"
973+
},
974+
{
975+
"name": "cloud_logs_ingress_endpoint",
976+
"value": "ref:./members/4a - Essential Security - Cloud Logs for logging/outputs/cloud_logs_ingress_private_endpoint"
977+
}
978+
]
979+
},
936980
{
937981
"name": "6 - Workload - Sample RAG Application",
938982
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e7af3542-6a4a-44fe-b646-2598bb925719-global",

‎tests/pr_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ var permanentResources map[string]interface{}
2525

2626
// Current supported regions (NOTE: eu-es is not being used as we don't have extended trial plan quota in that region currently. Not using us-south on request from SM team)
2727
var validRegions = []string{
28-
"eu-de",
28+
// "eu-de", temp disable due to quota issue in account
29+
"us-south",
2930
}
3031

3132
func TestMain(m *testing.M) {

0 commit comments

Comments
 (0)