From 14f10a028368a08247622fa7cccdf1de25ae1f11 Mon Sep 17 00:00:00 2001 From: David Massey Date: Mon, 24 Jun 2024 15:14:37 -0500 Subject: [PATCH] add update to cp4d 5.0.0 Signed-off-by: David Massey --- .../cp4d-cloud-pak-deployer-pipeline-run.yaml | 20 ++- .../cp4d-cloud-pak-deployer-pipeline.yaml | 128 +++++++++++++---- .../cp4d-cloud-pak-deployer-pipeline-run.yaml | 20 ++- .../cp4d-cloud-pak-deployer-pipeline.yaml | 129 ++++++++++++++---- 4 files changed, 243 insertions(+), 54 deletions(-) diff --git a/cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline-run.yaml b/cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline-run.yaml index b4a3bd4..f9d7776 100644 --- a/cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline-run.yaml +++ b/cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline-run.yaml @@ -40,12 +40,22 @@ spec: # value: "installed" # - name: wkc-state # value: "installed" - # - name: wkc-options-core-only - # value: "True" # - name: wkc-options-knowledge-graph # value: "True" # - name: wkc-options-enable-data-quality # value: "True" + # - name: ikc-premium-state + # value: "installed" + # - name: ikc-premium-options-knowledge-graph + # value: "True" + # - name: ikc-premium-options-enable-data-quality + # value: "True" + # - name: ikc-standard-state + # value: "installed" + # - name: ikc-standard-options-knowledge-graph + # value: "True" + # - name: ikc-standard-options-enable-data-quality + # value: "True" # - name: watsonx-orchestrate-state # value: "installed" # - name: watsonx-assistant-state @@ -69,8 +79,12 @@ spec: # - name: configure-gpu #Set this to False if you already installed/configured NVIDIA and NFD operators or don't have GPUs # value: "False" # - name: install-openshift-ai - # value: "installed" + # value: "True" # - name: ws-state # value: "installed" # - name: wml-state # value: "installed" + # - name: match360-state + # value: "installed" + # - name: watson-discovery-state + # value: "installed" diff --git a/cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline.yaml b/cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline.yaml index 8846d6e..09fe74a 100644 --- a/cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline.yaml +++ b/cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline.yaml @@ -920,7 +920,7 @@ spec: - name: wkc-state type: string description: | - Do you want to install watson knowledge catalog? + Do you want to install IBM Knowledge Catalog? { "options": [ {"text": "No","value": "removed", "default": "true"}, @@ -940,21 +940,21 @@ spec: ] } default: "small" - - name: wkc-options-core-only + - name: wkc-options-knowledge-graph type: string description: | - Do you want to install core wkc only? (only applied if wkc is installed) + Do you want to enable knowledge graph for wkc? (only applied if wkc is installed) { "options": [ - {"text": "Yes","value": "True", "default": "true"}, - {"text": "No","value": "False"} + {"text": "No","value": "False", "default": "true"}, + {"text": "Yes","value": "True"} ] } - default: "True" - - name: wkc-options-knowledge-graph + default: "False" + - name: wkc-options-enable-data-quality type: string description: | - Do you want to enable knowledge graph for wkc? (only applied if wkc is installed) + Do you want to enable data quality for wkc? { "options": [ {"text": "No","value": "False", "default": "true"}, @@ -962,10 +962,44 @@ spec: ] } default: "False" - - name: wkc-options-enable-data-quality + - name: ikc-premium-state type: string description: | - Do you want to enable data quality for wkc? + Do you want to install ikc-premium (IBM Knowledge Catalog Premium? + { + "options": [ + {"text": "No","value": "removed", "default": "true"}, + {"text": "Yes","value": "installed"} + ] + } + default: "removed" + - name: ikc-premium-size + type: string + description: | + Choose size of ikc-premium. (only applied if component is installed) + { + "options": [ + {"text": "Small","value": "small", "default": "true"}, + {"text": "Medium","value": "medium"}, + {"text": "Large","value": "large"} + ] + } + default: "small" + - name: ikc-premium-options-knowledge-graph + type: string + description: | + Do you want to enable knowledge graph for ikc-premium? (only applied if ikc-premium is installed) + { + "options": [ + {"text": "No","value": "False", "default": "true"}, + {"text": "Yes","value": "True"} + ] + } + default: "False" + - name: ikc-premium-options-enable-data-quality + type: string + description: | + Do you want to enable data quality for ikc-premium? { "options": [ {"text": "No","value": "False", "default": "true"}, @@ -973,10 +1007,44 @@ spec: ] } default: "False" - - name: wkc-options-enable-fact-sheet + - name: ikc-standard-state type: string description: | - Do you want to enable fact sheet for wkc? + Do you want to install ikc-standard (IBM Knowledge Catalog Standard? + { + "options": [ + {"text": "No","value": "removed", "default": "true"}, + {"text": "Yes","value": "installed"} + ] + } + default: "removed" + - name: ikc-standard-size + type: string + description: | + Choose size of ikc-standard. (only applied if component is installed) + { + "options": [ + {"text": "Small","value": "small", "default": "true"}, + {"text": "Medium","value": "medium"}, + {"text": "Large","value": "large"} + ] + } + default: "small" + - name: ikc-standard-options-knowledge-graph + type: string + description: | + Do you want to enable knowledge graph for ikc-standard? (only applied if ikc-standard is installed) + { + "options": [ + {"text": "No","value": "False", "default": "true"}, + {"text": "Yes","value": "True"} + ] + } + default: "False" + - name: ikc-standard-options-enable-data-quality + type: string + description: | + Do you want to enable data quality for ikc-standard? { "options": [ {"text": "No","value": "False", "default": "true"}, @@ -1585,7 +1653,7 @@ spec: size: $(params.factsheet-size) state: $(params.factsheet-state) - - name: hadoop + - name: hee description: Execution Engine for Apache Hadoop size: $(params.hadoop-size) state: $(params.hadoop-state) @@ -1733,19 +1801,33 @@ spec: description: watsonx.orchestrate app_connect: app_connect_project: ibm-app-connect - app_connect_case_version: 11.3.0 - app_connect_channel_version: v11.3 + app_connect_case_version: 11.5.0 + app_connect_channel_version: v11.5 state: $(params.watsonx-orchestrate-state) - name: wkc - description: Watson Knowledge Catalog + description: IBM Knowledge Catalog size: $(params.wkc-size) state: $(params.wkc-state) installation_options: - install_wkc_core_only: $(params.wkc-options-core-only) enableKnowledgeGraph: $(params.wkc-options-knowledge-graph) enableDataQuality: $(params.wkc-options-enable-data-quality) - enableFactSheet: $(params.wkc-options-enable-fact-sheet) + + - name: ikc_premium + description: IBM Knowledge Catalog - Premium edition + size: $(params.ikc-premium-size) + state: $(params.ikc-premium-state) + installation_options: + enableKnowledgeGraph: $(params.ikc-premium-options-knowledge-graph) + enableDataQuality: $(params.ikc-premium-options-enable-data-quality) + + - name: ikc_standard + description: IBM Knowledge Catalog - Standard edition + size: $(params.ikc-standard-size) + state: $(params.ikc-standard-state) + installation_options: + enableKnowledgeGraph: $(params.ikc-standard-options-knowledge-graph) + enableDataQuality: $(params.ikc-standard-options-enable-data-quality) - name: wml description: Watson Machine Learning @@ -1769,13 +1851,11 @@ spec: - name: ws-runtimes description: Watson Studio Runtimes runtimes: - - ibm-cpd-ws-runtime-py39 - - ibm-cpd-ws-runtime-222-py - - ibm-cpd-ws-runtime-py39gpu - - ibm-cpd-ws-runtime-222-pygpu + - 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-r36 - - ibm-cpd-ws-runtime-222-r + - ibm-cpd-ws-runtime-241-r - ibm-cpd-ws-runtime-231-r state: $(params.ws-runtimes-state) diff --git a/cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline-run.yaml b/cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline-run.yaml index 8599a6c..835169f 100644 --- a/cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline-run.yaml +++ b/cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline-run.yaml @@ -42,12 +42,22 @@ spec: # value: "installed" # - name: wkc-state # value: "installed" - # - name: wkc-options-core-only - # value: "True" # - name: wkc-options-knowledge-graph # value: "True" # - name: wkc-options-enable-data-quality # value: "True" + # - name: ikc-premium-state + # value: "installed" + # - name: ikc-premium-options-knowledge-graph + # value: "True" + # - name: ikc-premium-options-enable-data-quality + # value: "True" + # - name: ikc-standard-state + # value: "installed" + # - name: ikc-standard-options-knowledge-graph + # value: "True" + # - name: ikc-standard-options-enable-data-quality + # value: "True" # - name: watsonx-orchestrate-state # value: "installed" # - name: watsonx-assistant-state @@ -71,8 +81,12 @@ spec: # - name: configure-gpu #Set this to False if you already installed/configured NVIDIA and NFD operators or don't have GPUs # value: "False" # - name: install-openshift-ai - # value: "installed" + # value: "True" # - name: ws-state # value: "installed" # - name: wml-state # value: "installed" + # - name: match360-state + # value: "installed" + # - name: watson-discovery-state + # value: "installed" diff --git a/cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline.yaml b/cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline.yaml index e9ddcb7..d4017ad 100644 --- a/cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline.yaml +++ b/cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline.yaml @@ -939,7 +939,7 @@ spec: - name: wkc-state type: string description: | - Do you want to install watson knowledge catalog? + Do you want to install IBM Knowledge Catalog? { "options": [ {"text": "No","value": "removed", "default": "true"}, @@ -959,21 +959,21 @@ spec: ] } default: "small" - - name: wkc-options-core-only + - name: wkc-options-knowledge-graph type: string description: | - Do you want to install core wkc only? (only applied if wkc is installed) + Do you want to enable knowledge graph for wkc? (only applied if wkc is installed) { "options": [ - {"text": "Yes","value": "True", "default": "true"}, - {"text": "No","value": "False"} + {"text": "No","value": "False", "default": "true"}, + {"text": "Yes","value": "True"} ] } - default: "True" - - name: wkc-options-knowledge-graph + default: "False" + - name: wkc-options-enable-data-quality type: string description: | - Do you want to enable knowledge graph for wkc? (only applied if wkc is installed) + Do you want to enable data quality for wkc? { "options": [ {"text": "No","value": "False", "default": "true"}, @@ -981,10 +981,33 @@ spec: ] } default: "False" - - name: wkc-options-enable-data-quality + - name: ikc-premium-state type: string description: | - Do you want to enable data quality for wkc? + Do you want to install ikc-premium (IBM Knowledge Catalog Premium? + { + "options": [ + {"text": "No","value": "removed", "default": "true"}, + {"text": "Yes","value": "installed"} + ] + } + default: "removed" + - name: ikc-premium-size + type: string + description: | + Choose size of ikc-premium. (only applied if component is installed) + { + "options": [ + {"text": "Small","value": "small", "default": "true"}, + {"text": "Medium","value": "medium"}, + {"text": "Large","value": "large"} + ] + } + default: "small" + - name: ikc-premium-options-knowledge-graph + type: string + description: | + Do you want to enable knowledge graph for ikc-premium? (only applied if ikc-premium is installed) { "options": [ {"text": "No","value": "False", "default": "true"}, @@ -992,10 +1015,10 @@ spec: ] } default: "False" - - name: wkc-options-enable-fact-sheet + - name: ikc-premium-options-enable-data-quality type: string description: | - Do you want to enable fact sheet for wkc? + Do you want to enable data quality for ikc-premium? { "options": [ {"text": "No","value": "False", "default": "true"}, @@ -1003,6 +1026,52 @@ spec: ] } default: "False" + - name: ikc-standard-state + type: string + description: | + Do you want to install ikc-standard (IBM Knowledge Catalog Standard? + { + "options": [ + {"text": "No","value": "removed", "default": "true"}, + {"text": "Yes","value": "installed"} + ] + } + default: "removed" + - name: ikc-standard-size + type: string + description: | + Choose size of ikc-standard. (only applied if component is installed) + { + "options": [ + {"text": "Small","value": "small", "default": "true"}, + {"text": "Medium","value": "medium"}, + {"text": "Large","value": "large"} + ] + } + default: "small" + - name: ikc-standard-options-knowledge-graph + type: string + description: | + Do you want to enable knowledge graph for ikc-standard? (only applied if ikc-standard is installed) + { + "options": [ + {"text": "No","value": "False", "default": "true"}, + {"text": "Yes","value": "True"} + ] + } + default: "False" + - name: ikc-standard-options-enable-data-quality + type: string + description: | + Do you want to enable data quality for ikc-standard? + { + "options": [ + {"text": "No","value": "False", "default": "true"}, + {"text": "Yes","value": "True"} + ] + } + default: "False" + - name: watsonx-orchestrate-state type: string description: | @@ -1608,7 +1677,7 @@ spec: size: $(params.factsheet-size) state: $(params.factsheet-state) - - name: hadoop + - name: hee description: Execution Engine for Apache Hadoop size: $(params.hadoop-size) state: $(params.hadoop-state) @@ -1759,19 +1828,33 @@ spec: description: watsonx.orchestrate app_connect: app_connect_project: ibm-app-connect - app_connect_case_version: 11.3.0 - app_connect_channel_version: v11.3 + app_connect_case_version: 11.5.0 + app_connect_channel_version: v11.5 state: $(params.watsonx-orchestrate-state) - name: wkc - description: Watson Knowledge Catalog + description: IBM Knowledge Catalog size: $(params.wkc-size) state: $(params.wkc-state) installation_options: - install_wkc_core_only: $(params.wkc-options-core-only) enableKnowledgeGraph: $(params.wkc-options-knowledge-graph) enableDataQuality: $(params.wkc-options-enable-data-quality) - enableFactSheet: $(params.wkc-options-enable-fact-sheet) + + - name: ikc_premium + description: IBM Knowledge Catalog - Premium edition + size: $(params.ikc-premium-size) + state: $(params.ikc-premium-state) + installation_options: + enableKnowledgeGraph: $(params.ikc-premium-options-knowledge-graph) + enableDataQuality: $(params.ikc-premium-options-enable-data-quality) + + - name: ikc_standard + description: IBM Knowledge Catalog - Standard edition + size: $(params.ikc-standard-size) + state: $(params.ikc-standard-state) + installation_options: + enableKnowledgeGraph: $(params.ikc-standard-options-knowledge-graph) + enableDataQuality: $(params.ikc-standard-options-enable-data-quality) - name: wml description: Watson Machine Learning @@ -1795,13 +1878,11 @@ spec: - name: ws-runtimes description: Watson Studio Runtimes runtimes: - - ibm-cpd-ws-runtime-py39 - - ibm-cpd-ws-runtime-222-py - - ibm-cpd-ws-runtime-py39gpu - - ibm-cpd-ws-runtime-222-pygpu + - 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-r36 - - ibm-cpd-ws-runtime-222-r + - ibm-cpd-ws-runtime-241-r - ibm-cpd-ws-runtime-231-r state: $(params.ws-runtimes-state)