From 27f7e3c42b6aaf4301065284562b691a64558022 Mon Sep 17 00:00:00 2001 From: Frank Ketelaars Date: Mon, 9 Dec 2024 21:48:20 +0000 Subject: [PATCH] #836 Add CP4D 5.1.0 sample config --- .../config-samples/cp4d-500.yaml | 420 ------------------ .../config-samples/cp4d-501.yaml | 391 ---------------- .../{cp4d-502.yaml => cp4d-510.yaml} | 22 +- 3 files changed, 11 insertions(+), 822 deletions(-) delete mode 100644 sample-configurations/sample-dynamic/config-samples/cp4d-500.yaml delete mode 100644 sample-configurations/sample-dynamic/config-samples/cp4d-501.yaml rename sample-configurations/sample-dynamic/config-samples/{cp4d-502.yaml => cp4d-510.yaml} (96%) diff --git a/sample-configurations/sample-dynamic/config-samples/cp4d-500.yaml b/sample-configurations/sample-dynamic/config-samples/cp4d-500.yaml deleted file mode 100644 index e7bba87b3..000000000 --- a/sample-configurations/sample-dynamic/config-samples/cp4d-500.yaml +++ /dev/null @@ -1,420 +0,0 @@ ---- -cp4d: -- project: cpd - openshift_cluster_name: "{{ env_id }}" - cp4d_version: 5.0.0 - cp4d_entitlement: - - cpd-enterprise - # - cpd-standard - # - cognos-analytics - # - data-product-hub - # - datastage - # - ikc-premium - # - ikc-standard - # - openpages - # - planning-analytics - # - product-master - # - speech-to-text - # - text-to-speech - # - watson-assistant - # - watson-discovery - # - watsonx-ai - # - watsonx-code-assistant-ansible - # - watsonx-code-assistant-z - # - watsonx-data - # - watsonx-gov-mm - # - watsonx-gov-rc - # - watsonx-orchestrate - cp4d_production_license: True - accept_licenses: False - db2u_limited_privileges: False - use_fs_iam: True - operators_project: cpd-operators - state: installed - cartridges: - - name: cp-foundation - license_service: - threads_per_core: 2 - - - name: lite - - - name: scheduler - state: removed - -# -# All tested cartridges. To install, change the "state" property to "installed". To uninstall, change the state -# to "removed" or comment out the entire cartridge. Make sure that the "-" and properties are aligned with the lite -# cartridge; the "-" is at position 3 and the property starts at position 5. -# -# If a cartridge has dependencies and you want to install it, you must ensure that the dependent cartridge is also -# installed. -# - - - name: analyticsengine - description: Analytics Engine Powered by Apache Spark - size: small - state: removed - - - name: bigsql - description: Db2 Big SQL - state: removed - - - name: ca - description: Cognos Analytics - size: small - instances: - - name: ca-instance - metastore_ref: ca-metastore - state: removed - - - name: dashboard - description: Cognos Dashboards - state: removed - - - name: datagate - description: Db2 Data Gate - state: removed - - - name: dataproduct - description: Data Product Hub - state: removed - - - name: datastage-ent - description: DataStage Enterprise - state: removed - - - name: datastage-ent-plus - description: DataStage Enterprise Plus - state: removed - - # The default instance is created automatically with the DataStage installation. If you want to create additional instances - # uncomment the section below and specify the various scaling options. - - # instances: - # - name: ds-instance - # # Optional settings - # description: "datastage ds-instance" - # size: medium - # storage_class: efs-nfs-client - # storage_size_gb: 60 - # # Custom Scale options - # scale_px_runtime: - # replicas: 2 - # cpu_request: 500m - # cpu_limit: 2 - # memory_request: 2Gi - # memory_limit: 4Gi - # scale_px_compute: - # replicas: 2 - # cpu_request: 1 - # cpu_limit: 3 - # memory_request: 4Gi - # memory_limit: 12Gi - - - name: db2 - description: Db2 OLTP - size: small - instances: - - name: ca-metastore - metadata_size_gb: 20 - data_size_gb: 20 - backup_size_gb: 20 - transactionlog_size_gb: 20 - state: removed - - - name: db2wh - description: Db2 Warehouse - state: removed - - - name: dmc - description: Db2 Data Management Console - state: removed - instances: - - name: data-management-console - description: Data Management Console - size: medium - storage_size_gb: 50 - - - name: dods - description: Decision Optimization - size: small - state: removed - - - name: dp - description: Data Privacy - size: small - state: removed - - - name: dpra - description: Data Privacy Risk Assessment - state: removed - - - name: dv - description: Data Virtualization - size: small - instances: - - name: data-virtualization - state: removed - - # Please note that for EDB Postgress, a secret edb-postgres-license-key must be created in the vault - # before deploying - - name: edb_cp4d - description: EDB Postgres - state: removed - instances: - - name: instance1 - version: "15.4" - #type: Standard - #members: 1 - #size_gb: 50 - #resource_request_cpu: 1 - #resource_request_memory: 4Gi - #resource_limit_cpu: 1 - #resource_limit_memory: 4Gi - - - name: factsheet - description: AI Factsheets - size: small - state: removed - - - name: hee - description: Execution Engine for Apache Hadoop - size: small - state: removed - - - name: mantaflow - description: MANTA Automated Lineage - size: small - state: removed - - - name: match360 - description: IBM Match 360 - size: small - wkc_enabled: true - state: removed - - - name: mongodb - description: MongoDB for Cloud Pak for Data - state: removed - - - name: openpages - description: OpenPages - state: removed - - # For Planning Analytics, the case version is needed due to defect in olm utils - - name: planning-analytics - description: Planning Analytics - state: removed - - - name: replication - description: Data Replication - license: IDRC - size: small - state: removed - - - name: rstudio - description: RStudio Server with R 3.6 - size: small - state: removed - - - name: spss - description: SPSS Modeler - state: removed - - - name: syntheticdata - description: Synthetic Data Generator - state: removed - - - name: voice-gateway - description: Voice Gateway - replicas: 1 - state: removed - - - name: watson-assistant - description: Watson Assistant - # noobaa_account_secret: noobaa-admin - # noobaa_cert_secret: noobaa-s3-serving-cert - state: removed - installation_options: - watson_assistant_size: Starter - watson_assistant_bigpv: false - watson_assistant_analytics_enabled: true - watson_assistant_GPU_features_enabled: false - instances: - - name: wa-instance - description: "Watson Assistant instance" - - - name: watson-discovery - description: Watson Discovery - # noobaa_account_secret: noobaa-admin - # noobaa_cert_secret: noobaa-s3-serving-cert - state: removed - instances: - - name: wd-instance - description: "Watson Discovery instance" - - - name: watson-openscale - description: Watson OpenScale - size: small - state: removed - - - name: watson-speech - description: Watson Speech (STT and TTS) - stt_size: xsmall - tts_size: xsmall - # noobaa_account_secret: noobaa-admin - # noobaa_cert_secret: noobaa-s3-serving-cert - state: removed - - # Please note that for watsonx.ai, the following pre-requisites exist: - # If you want to use foundation models, you neeed to install the Node Feature Discovery and NVIDIA GPU operators. - # You can do so by setting the openshift.gpu.install property to True - # OpenShift AI is a requirement for watsonx.ai. You can install this by setting the openshift.openshift_ai.install property to True - - name: watsonx_ai - description: watsonx.ai - state: removed - installation_options: - tuning_disabled: true - models: - - model_id: allam-1-13b-instruct - state: removed - - model_id: codellama-codellama-34b-instruct-hf - state: removed - - model_id: elyza-japanese-llama-2-7b-instruct - state: removed - - model_id: google-flan-ul2 - state: removed - - model_id: google-flan-t5-xl - state: removed - - model_id: google-flan-t5-xxl - state: removed - - model_id: eleutherai-gpt-neox-20b - state: removed - - model_id: ibm-granite-8b-japanese - state: removed - - model_id: ibm-granite-13b-chat-v1 - state: removed - - model_id: ibm-granite-13b-chat-v2 - state: removed - - model_id: ibm-granite-13b-instruct-v1 - state: removed - - model_id: ibm-granite-13b-instruct-v2 - state: removed - - model_id: ibm-granite-20b-multilingual - state: removed - - model_id: core42-jais-13b-chat - state: removed - - model_id: meta-llama-llama-2-13b-chat - state: removed - - model_id: meta-llama-llama-3-8b-instruct - state: removed - - model_id: meta-llama-llama-2-70b-chat - state: removed - - model_id: mncai-llama-2-13b-dpo-v7 - state: removed - - model_id: ibm-mistralai-merlinite-7b - state: removed - - model_id: ibm-mpt-7b-instruct2 - state: removed - - model_id: mistralai-mixtral-8x7b-instruct-v01 - state: removed - - model_id: ibm-mistralai-mixtral-8x7b-instruct-v01-q - state: removed - - model_id: bigscience-mt0-xxl - state: removed - - model_id: bigcode-starcoder - state: removed - - - name: watsonx_data - description: watsonx.data - state: removed - - - name: watsonx_governance - description: watsonx.governance - state: removed - installation_options: - installType: all - enableFactsheet: true - enableOpenpages: true - enableOpenscale: true - - - name: watsonx_orchestrate - description: watsonx.orchestrate - app_connect: - app_connect_project: ibm-app-connect - app_connect_case_version: 11.5.0 - app_connect_channel_version: v11.5 - state: removed - - - name: wca-ansible - description: watsxonx Code Assistant for Red Hat Ansible Lightspeed - state: removed - - - name: wca-z - description: watsxonx Code Assistant for Z - state: removed - - # For the IBM Knowledge Catalog, you can specify 3 editions: wkx, ikc_premium, or ikc_standard - # Choose the correct IBM Knowledge Catalog edition below - - name: wkc - description: IBM Knowledge Catalog - size: small - state: removed - installation_options: - enableKnowledgeGraph: False - enableDataQuality: False - - - name: ikc_premium - description: IBM Knowledge Catalog - Premium edition - size: small - state: removed - installation_options: - enableKnowledgeGraph: False - enableDataQuality: False - - - name: ikc_standard - description: IBM Knowledge Catalog - Standard edition - size: small - state: removed - installation_options: - enableKnowledgeGraph: False - enableDataQuality: False - - - name: wml - description: Watson Machine Learning - size: small - state: installed - - - name: wml-accelerator - description: Watson Machine Learning Accelerator - replicas: 1 - size: small - state: removed - - - name: ws - description: Watson Studio - state: installed - - - name: ws-pipelines - description: Watson Studio Pipelines - state: removed - - - name: ws-runtimes - description: Watson Studio Runtimes - runtimes: - - ibm-cpd-ws-runtime-241-py - - ibm-cpd-ws-runtime-231-py - - ibm-cpd-ws-runtime-241-pygpu - - ibm-cpd-ws-runtime-231-pygpu - - ibm-cpd-ws-runtime-241-r - - ibm-cpd-ws-runtime-231-r - state: removed - -# -# Cartridges where extra work is needed (will not install automatically) -# - # Product Master requires set up of the Db2 instance secret before install - - name: productmaster - description: Product Master - size: small - state: removed \ No newline at end of file diff --git a/sample-configurations/sample-dynamic/config-samples/cp4d-501.yaml b/sample-configurations/sample-dynamic/config-samples/cp4d-501.yaml deleted file mode 100644 index 163bce030..000000000 --- a/sample-configurations/sample-dynamic/config-samples/cp4d-501.yaml +++ /dev/null @@ -1,391 +0,0 @@ ---- -cp4d: -- project: cpd - openshift_cluster_name: "{{ env_id }}" - cp4d_version: 5.0.1 - cp4d_entitlement: cpd-enterprise # or: cpd-standard, watsonx-ai, watsonx-data, watsonx-gov-model-management, watsonx-gov-risk-compliance - cp4d_production_license: True - accept_licenses: False - sequential_install: True - db2u_limited_privileges: False - use_fs_iam: True - operators_project: cpd-operators - cartridges: - - name: cp-foundation - license_service: - threads_per_core: 2 - - - name: lite - - - name: scheduler - state: removed - -# -# All tested cartridges. To install, change the "state" property to "installed". To uninstall, change the state -# to "removed" or comment out the entire cartridge. Make sure that the "-" and properties are aligned with the lite -# cartridge; the "-" is at position 3 and the property starts at position 5. -# -# If a cartridge has dependencies and you want to install it, you must ensure that the dependent cartridge is also -# installed. -# - - - name: analyticsengine - description: Analytics Engine Powered by Apache Spark - size: small - state: removed - - - name: bigsql - description: Db2 Big SQL - state: removed - - - name: ca - description: Cognos Analytics - size: small - instances: - - name: ca-instance - metastore_ref: ca-metastore - state: removed - - - name: dashboard - description: Cognos Dashboards - state: removed - - - name: datagate - description: Db2 Data Gate - state: removed - - - name: dataproduct - description: Data Product Hub - state: removed - - - name: datastage-ent - description: DataStage Enterprise - state: removed - - - name: datastage-ent-plus - description: DataStage Enterprise Plus - state: removed - # instances: - # - name: ds-instance - # # Optional settings - # description: "datastage ds-instance" - # size: medium - # storage_class: efs-nfs-client - # storage_size_gb: 60 - # # Custom Scale options - # scale_px_runtime: - # replicas: 2 - # cpu_request: 500m - # cpu_limit: 2 - # memory_request: 2Gi - # memory_limit: 4Gi - # scale_px_compute: - # replicas: 2 - # cpu_request: 1 - # cpu_limit: 3 - # memory_request: 4Gi - # memory_limit: 12Gi - - - name: db2 - description: Db2 OLTP - size: small - instances: - - name: ca-metastore - metadata_size_gb: 20 - data_size_gb: 20 - backup_size_gb: 20 - transactionlog_size_gb: 20 - state: removed - - - name: db2wh - description: Db2 Warehouse - state: removed - - - name: dmc - description: Db2 Data Management Console - state: removed - instances: - - name: data-management-console - description: Data Management Console - size: medium - storage_size_gb: 50 - - - name: dods - description: Decision Optimization - size: small - state: removed - - - name: dp - description: Data Privacy - size: small - state: removed - - - name: dpra - description: Data Privacy Risk Assessment - state: removed - - - name: dv - description: Data Virtualization - size: small - instances: - - name: data-virtualization - state: removed - - # Please note that for EDB Postgress, a secret edb-postgres-license-key must be created in the vault - # before deploying - - name: edb_cp4d - description: EDB Postgres - state: removed - instances: - - name: instance1 - version: "15.4" - #type: Standard - #members: 1 - #size_gb: 50 - #resource_request_cpu: 1 - #resource_request_memory: 4Gi - #resource_limit_cpu: 1 - #resource_limit_memory: 4Gi - - - name: factsheet - description: AI Factsheets - size: small - state: removed - - - name: hee - description: Execution Engine for Apache Hadoop - size: small - state: removed - - - name: mantaflow - description: MANTA Automated Lineage - size: small - state: removed - - - name: match360 - description: IBM Match 360 - size: small - wkc_enabled: true - state: removed - - - name: mongodb - description: MongoDB for Cloud Pak for Data - state: removed - - - name: openpages - description: OpenPages - state: removed - - # For Planning Analytics, the case version is needed due to defect in olm utils - - name: planning-analytics - description: Planning Analytics - state: removed - - - name: replication - description: Data Replication - license: IDRC - size: small - state: removed - - - name: rstudio - description: RStudio Server with R 3.6 - size: small - state: removed - - - name: spss - description: SPSS Modeler - state: removed - - - name: syntheticdata - description: Synthetic Data Generator - state: removed - - - name: voice-gateway - description: Voice Gateway - replicas: 1 - state: removed - - - name: watson-assistant - description: Watson Assistant - size: small - # noobaa_account_secret: noobaa-admin - # noobaa_cert_secret: noobaa-s3-serving-cert - state: removed - instances: - - name: wa-instance - description: "Watson Assistant instance" - - - name: watson-discovery - description: Watson Discovery - # noobaa_account_secret: noobaa-admin - # noobaa_cert_secret: noobaa-s3-serving-cert - state: removed - instances: - - name: wd-instance - description: "Watson Discovery instance" - - - name: watson-openscale - description: Watson OpenScale - size: small - state: removed - - - name: watson-speech - description: Watson Speech (STT and TTS) - stt_size: xsmall - tts_size: xsmall - # noobaa_account_secret: noobaa-admin - # noobaa_cert_secret: noobaa-s3-serving-cert - state: removed - - # Please note that for watsonx.ai, the following pre-requisites exist: - # If you want to use foundation models, you neeed to install the Node Feature Discovery and NVIDIA GPU operators. - # You can do so by setting the openshift.gpu.install property to True - # OpenShift AI is a requirement for watsonx.ai. You can install this by setting the openshift.openshift_ai.install property to True - - name: watsonx_ai - description: watsonx.ai - state: removed - installation_options: - tuning_disabled: true - models: - - model_id: allam-1-13b-instruct - state: removed - - model_id: codellama-codellama-34b-instruct-hf - state: removed - - model_id: elyza-japanese-llama-2-7b-instruct - state: removed - - model_id: google-flan-ul2 - state: removed - - model_id: google-flan-t5-xl - state: removed - - model_id: google-flan-t5-xxl - state: removed - - model_id: eleutherai-gpt-neox-20b - state: removed - - model_id: ibm-granite-8b-japanese - state: removed - - model_id: ibm-granite-13b-chat-v1 - state: removed - - model_id: ibm-granite-13b-chat-v2 - state: removed - - model_id: ibm-granite-13b-instruct-v1 - state: removed - - model_id: ibm-granite-13b-instruct-v2 - state: removed - - model_id: ibm-granite-20b-multilingual - state: removed - - model_id: core42-jais-13b-chat - state: removed - - model_id: meta-llama-llama-2-13b-chat - state: removed - - model_id: meta-llama-llama-3-8b-instruct - state: removed - - model_id: meta-llama-llama-2-70b-chat - state: removed - - model_id: mncai-llama-2-13b-dpo-v7 - state: removed - - model_id: ibm-mistralai-merlinite-7b - state: removed - - model_id: ibm-mpt-7b-instruct2 - state: removed - - model_id: mistralai-mixtral-8x7b-instruct-v01 - state: removed - - model_id: ibm-mistralai-mixtral-8x7b-instruct-v01-q - state: removed - - model_id: bigscience-mt0-xxl - state: removed - - model_id: bigcode-starcoder - state: removed - - - name: watsonx_data - description: watsonx.data - state: removed - - - name: watsonx_governance - description: watsonx.governance - state: removed - installation_options: - installType: all - enableFactsheet: true - enableOpenpages: true - enableOpenscale: true - - - name: watsonx_orchestrate - description: watsonx.orchestrate - app_connect: - app_connect_project: ibm-app-connect - app_connect_case_version: 11.5.0 - app_connect_channel_version: v11.5 - state: removed - - - name: wca-ansible - description: watsxonx Code Assistant for Red Hat Ansible Lightspeed - state: removed - - - name: wca-z - description: watsxonx Code Assistant for Z - state: removed - - # For the IBM Knowledge Catalog, you can specify 3 editions: wkx, ikc_premium, or ikc_standard - # Choose the correct IBM Knowledge Catalog edition below - - name: wkc - description: IBM Knowledge Catalog - size: small - state: removed - installation_options: - enableKnowledgeGraph: False - enableDataQuality: False - - - name: ikc_premium - description: IBM Knowledge Catalog - Premium edition - size: small - state: removed - installation_options: - enableKnowledgeGraph: False - enableDataQuality: False - - - name: ikc_standard - description: IBM Knowledge Catalog - Standard edition - size: small - state: removed - installation_options: - enableKnowledgeGraph: False - enableDataQuality: False - - - name: wml - description: Watson Machine Learning - size: small - state: installed - - - name: wml-accelerator - description: Watson Machine Learning Accelerator - replicas: 1 - size: small - state: removed - - - name: ws - description: Watson Studio - state: installed - - - name: ws-pipelines - description: Watson Studio Pipelines - state: removed - - - name: ws-runtimes - description: Watson Studio Runtimes - runtimes: - - ibm-cpd-ws-runtime-241-py - - ibm-cpd-ws-runtime-231-py - - ibm-cpd-ws-runtime-241-pygpu - - ibm-cpd-ws-runtime-231-pygpu - - ibm-cpd-ws-runtime-241-r - - ibm-cpd-ws-runtime-231-r - state: removed - -# -# Cartridges where extra work is needed (will not install automatically) -# - # Product Master requires set up of the Db2 instance secret before install - - name: productmaster - description: Product Master - size: small - state: removed \ No newline at end of file diff --git a/sample-configurations/sample-dynamic/config-samples/cp4d-502.yaml b/sample-configurations/sample-dynamic/config-samples/cp4d-510.yaml similarity index 96% rename from sample-configurations/sample-dynamic/config-samples/cp4d-502.yaml rename to sample-configurations/sample-dynamic/config-samples/cp4d-510.yaml index 4f7f5c176..21f417343 100644 --- a/sample-configurations/sample-dynamic/config-samples/cp4d-502.yaml +++ b/sample-configurations/sample-dynamic/config-samples/cp4d-510.yaml @@ -2,7 +2,7 @@ cp4d: - project: cpd openshift_cluster_name: "{{ env_id }}" - cp4d_version: 5.0.2 + cp4d_version: 5.1.0 cp4d_entitlement: - cpd-enterprise # - cpd-standard @@ -192,7 +192,7 @@ cp4d: - name: mongodb description: MongoDB for Cloud Pak for Data state: removed - + - name: openpages description: OpenPages state: removed @@ -298,7 +298,7 @@ cp4d: state: removed - model_id: meta-llama-llama-2-13b-chat state: removed - - model_id: meta-llama-llama-3-8b-instruct + - model_id: meta-llama-llama3-8b-instruct state: removed - model_id: meta-llama-llama-2-70b-chat state: removed @@ -334,8 +334,8 @@ cp4d: description: watsonx.orchestrate app_connect: app_connect_project: ibm-app-connect - app_connect_case_version: 11.5.0 - app_connect_channel_version: v11.5 + app_connect_case_version: 12.2.1 + app_connect_channel_version: v12.2 state: removed - name: wca-ansible @@ -353,24 +353,24 @@ cp4d: size: small state: removed installation_options: - enableKnowledgeGraph: False - enableDataQuality: False + enableKnowledgeGraph: True + enableDataQuality: True - name: ikc_premium description: IBM Knowledge Catalog - Premium edition size: small state: removed installation_options: - enableKnowledgeGraph: False - enableDataQuality: False + enableKnowledgeGraph: True + enableDataQuality: True - name: ikc_standard description: IBM Knowledge Catalog - Standard edition size: small state: removed installation_options: - enableKnowledgeGraph: False - enableDataQuality: False + enableKnowledgeGraph: True + enableDataQuality: True - name: wml description: Watson Machine Learning