Skip to content

Commit 518b7f2

Browse files
daniel-butler-irldaniel-butler-irl
committed
Update catalog def
1 parent 9d96ca8 commit 518b7f2

File tree

4 files changed

+48
-280
lines changed

4 files changed

+48
-280
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
.terraform
33
*.tfstate
44
*.lock.hcl
5+
.icat

‎ibm_catalog.json‎

Lines changed: 38 additions & 277 deletions
Original file line numberDiff line numberDiff line change
@@ -295,144 +295,12 @@
295295
],
296296
"dependency_version_2": true,
297297
"configuration": [
298-
{
299-
"key": "prefix",
300-
"required": true
301-
},
302298
{
303299
"key": "ibmcloud_api_key",
304300
"required": true
305-
},
306-
{
307-
"key": "signing_key",
308-
"display_name": "Multiline secure value",
309-
"required": false,
310-
"custom_config": {
311-
"type": "multiline_secure_value",
312-
"grouping": "deployment",
313-
"original_grouping": "deployment"
314-
}
315-
},
316-
{
317-
"key": "region",
318-
"required": false,
319-
"options": [
320-
{
321-
"displayname": "us-south",
322-
"value": "us-south"
323-
},
324-
{
325-
"displayname": "eu-de",
326-
"value": "eu-de"
327-
}
328-
]
329-
},
330-
{
331-
"key": "resource_group_name",
332-
"required": false
333-
},
334-
{
335-
"key": "existing_resource_group_name",
336-
"required": false
337-
},
338-
{
339-
"key": "watsonx_admin_api_key",
340-
"required": false
341-
},
342-
{
343-
"key": "secret_manager_service_plan",
344-
"required": false,
345-
"options": [
346-
{
347-
"displayname": "Trial",
348-
"value": "trial"
349-
},
350-
{
351-
"displayname": "Standard",
352-
"value": "standard"
353-
}
354-
]
355-
},
356-
{
357-
"key": "existing_secrets_manager_crn",
358-
"required": false
359-
},
360-
{
361-
"key": "enable_platform_logs_metrics",
362-
"required": false
363-
},
364-
{
365-
"key": "sample_app_git_url",
366-
"required": false
367-
},
368-
{
369-
"key": "existing_kms_instance_crn",
370-
"required": false
371-
},
372-
{
373-
"key": "existing_event_notification_instance_crn",
374-
"required": false
375-
},
376-
{
377-
"key": "existing_discovery_instance_crn",
378-
"required": false
379-
},
380-
{
381-
"key": "existing_assistant_instance_crn",
382-
"required": false
383-
},
384-
{
385-
"key": "existing_governance_instance_crn",
386-
"required": false
387-
},
388-
{
389-
"key": "existing_studio_instance_crn",
390-
"required": false
391-
},
392-
{
393-
"key": "existing_machine_learning_instance_crn",
394-
"required": false
395-
},
396-
{
397-
"key": "existing_elasticsearch_instance_crn",
398-
"required": false
399-
}
400-
],
401-
"outputs": [
402-
{
403-
"key": "elasticsearch_hostname",
404-
"description": "The hostname of the Elasticsearch instance."
405-
},
406-
{
407-
"key": "elasticsearch_port",
408-
"description": "The port of the Elasticsearch instance."
409-
},
410-
{
411-
"key": "elasticsearch_service_credentials_json",
412-
"description": "The service credentials of the Elasticsearch instance."
413-
},
414-
{
415-
"key": "elasticsearch_crn",
416-
"description": "The CRN of the Elasticsearch instance."
417-
},
418-
{
419-
"key": "watsonx_project_url",
420-
"description": "The URL to the WatsonX project for the sample RAG application."
421-
},
422-
{
423-
"key": "watsonx_project_id",
424-
"description": "The ID for the WatsonX project for the sample RAG application."
425-
},
426-
{
427-
"key": "watson_discovery_api_url",
428-
"description": "The URL to the Watson Discovery API endpoint."
429-
},
430-
{
431-
"key": "watson_discovery_project_id",
432-
"description": "The ID for the Watson Discovery project for the sample RAG application."
433301
}
434302
],
435-
"install_type": "extension"
303+
"outputs": []
436304
},
437305
{
438306
"label": "Standard (Deploy on Red Hat OpenShift)",
@@ -619,18 +487,7 @@
619487
"id": "bdb533aa-fe34-4f3b-bf35-0007fee74221",
620488
"input_mapping": [],
621489
"optional": true,
622-
"version": "^1.0.6"
623-
},
624-
{
625-
"name": "Testing_Gen_AI",
626-
"catalog_id": "f64499c8-eb50-4985-bf91-29f9e605a433",
627-
"flavors": [
628-
"Basic-dda0"
629-
],
630-
"id": "4460375e-8a34-46fc-9f06-0eb60e7d4f8c",
631-
"input_mapping": [],
632-
"optional": true,
633-
"version": "^1.0.9"
490+
"version": ">=1.0.6"
634491
},
635492
{
636493
"name": "Testing_Retrieval_Augmented_Generation_Pattern_dev",
@@ -653,149 +510,53 @@
653510
"id": "b773b1d4-69bb-48db-a657-2307015eb9c1",
654511
"input_mapping": [],
655512
"optional": true,
656-
"version": "^1.0.1"
657-
}
658-
],
659-
"dependency_version_2": true,
660-
"configuration": [
661-
{
662-
"key": "prefix",
663-
"required": true
664-
},
665-
{
666-
"key": "ibmcloud_api_key",
667-
"required": true
513+
"version": ">=1.0.1"
668514
},
669515
{
670-
"key": "signing_key",
671-
"display_name": "Multiline secure value",
672-
"required": false,
673-
"custom_config": {
674-
"type": "multiline_secure_value",
675-
"grouping": "deployment",
676-
"original_grouping": "deployment"
677-
}
678-
},
679-
{
680-
"key": "region",
681-
"required": false,
682-
"options": [
683-
{
684-
"displayname": "us-south",
685-
"value": "us-south"
686-
},
687-
{
688-
"displayname": "eu-de",
689-
"value": "eu-de"
690-
}
691-
]
692-
},
693-
{
694-
"key": "resource_group_name",
695-
"required": false
696-
},
697-
{
698-
"key": "existing_resource_group_name",
699-
"required": false
700-
},
701-
{
702-
"key": "watsonx_admin_api_key",
703-
"required": false
704-
},
705-
{
706-
"key": "secret_manager_service_plan",
707-
"required": false,
708-
"options": [
709-
{
710-
"displayname": "Trial",
711-
"value": "trial"
712-
},
713-
{
714-
"displayname": "Standard",
715-
"value": "standard"
716-
}
717-
]
718-
},
719-
{
720-
"key": "existing_secrets_manager_crn",
721-
"required": false
722-
},
723-
{
724-
"key": "enable_platform_logs_metrics",
725-
"required": false
726-
},
727-
{
728-
"key": "sample_app_git_url",
729-
"required": false
730-
},
731-
{
732-
"key": "existing_kms_instance_crn",
733-
"required": false
734-
},
735-
{
736-
"key": "existing_event_notification_instance_crn",
737-
"required": false
738-
},
739-
{
740-
"key": "existing_discovery_instance",
741-
"required": false
742-
},
743-
{
744-
"key": "existing_assistant_instance_crn",
745-
"required": false
746-
},
747-
{
748-
"key": "existing_governance_instance",
749-
"required": false
750-
},
751-
{
752-
"key": "existing_studio_instance",
753-
"required": false
516+
"name": "deploy-arch-ibm-watsonx-assistant",
517+
"id": "f0eab251-febe-4ae4-99ba-04d698fb6d20",
518+
"version": ">=v1.1.2",
519+
"flavors": [
520+
"standard"
521+
],
522+
"catalog_id": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd",
523+
"optional": true,
524+
"on_by_default": true,
525+
"input_mapping": []
754526
},
755527
{
756-
"key": "existing_machine_learning_instance",
757-
"required": false
528+
"name": "deploy-arch-ibm-watson-discovery",
529+
"id": "0f616276-a8a4-4399-bcbf-d3129f30295e",
530+
"version": ">=v1.1.1",
531+
"flavors": [
532+
"standard"
533+
],
534+
"catalog_id": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd",
535+
"optional": true,
536+
"on_by_default": true,
537+
"input_mapping": []
758538
},
759539
{
760-
"key": "existing_elasticsearch_instance_crn",
761-
"required": false
540+
"name": "deploy-arch-ibm-watsonx-ai",
541+
"id": "85b7c3d8-c947-408c-896c-52b375ceb1c0",
542+
"version": ">=0.0.0",
543+
"flavors": [
544+
"standard"
545+
],
546+
"catalog_id": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd",
547+
"optional": true,
548+
"on_by_default": true,
549+
"input_mapping": []
762550
}
763551
],
764-
"outputs": [
765-
{
766-
"key": "elasticsearch_hostname",
767-
"description": "The hostname of the Elasticsearch instance."
768-
},
769-
{
770-
"key": "elasticsearch_port",
771-
"description": "The port of the Elasticsearch instance."
772-
},
773-
{
774-
"key": "elasticsearch_service_credentials_json",
775-
"description": "The service credentials of the Elasticsearch instance."
776-
},
777-
{
778-
"key": "elasticsearch_crn",
779-
"description": "The CRN of the Elasticsearch instance."
780-
},
781-
{
782-
"key": "watsonx_project_url",
783-
"description": "The URL to the WatsonX project for the sample RAG application."
784-
},
785-
{
786-
"key": "watsonx_project_id",
787-
"description": "The ID for the WatsonX project for the sample RAG application."
788-
},
789-
{
790-
"key": "watson_discovery_api_url",
791-
"description": "The URL to the Watson Discovery API endpoint."
792-
},
552+
"dependency_version_2": true,
553+
"configuration": [
793554
{
794-
"key": "watson_discovery_project_id",
795-
"description": "The ID for the Watson Discovery project for the sample RAG application."
555+
"key": "ibmcloud_api_key",
556+
"required": true
796557
}
797558
],
798-
"install_type": "extension"
559+
"outputs": []
799560
}
800561
]
801562
}

‎solutions/basic/catalogValidationValues.json.template‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"ibmcloud_api_key": $VALIDATION_APIKEY,
3-
"prefix": $PREFIX
2+
"ibmcloud_api_key": $VALIDATION_APIKEY
43
}

‎solutions/basic/stack_definition.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
{
2-
"inputs": [],
2+
"inputs": [
3+
{
4+
"name": "ibmcloud_api_key",
5+
"required": true,
6+
"type": "string",
7+
"hidden": false
8+
}
9+
],
310
"members": [
411
{
512
"name": "testing-deploy-arch-ibm-mock-module",

0 commit comments

Comments
 (0)