version 2.0.0 (cpd 5.0.0)

Signed-off-by: Sébastien Chabrolles <[email protected]>

README.md

@@ -75,7 +75,7 @@ helm install cpd-install cpd-install-pipeline/cpd-install-pipeline \
 This will:
    - create a project `cpd-install`
    - give the **::“cluster-admin”::** right to the “**pipeline**” service-account of this project
-   - create a tekton task “**olm-utils**” based on the official `olm-utils-v2` from IBM (icr.io)
+   - create a tekton task “**olm-utils**” based on the official `olm-utils-v3` from IBM (icr.io)
    - create a tekton pipeline to install automatically the cloud pak for data `components` you choose
 
 ## Starting the pipeline
@@ -106,7 +106,7 @@ This will open a forms to customize your installation.
 
 - You need to provide at least your **IBM Entitlement key**
 - You can change the version, name of namespaces or storageclass to use
-- [list of available component](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=information-determining-which-components-install#collect-info-components__all-svcs)
+- [list of available component](https://www.ibm.com/docs/en/cloud-paks/cp-data/5.0.x?topic=information-determining-which-components-install)
 - If you are not running a production service, set **production** to **false**
 - if you don’t have GPUs but still want to deploy watsonx, set **NO_GPU** to **true**
 
@@ -150,7 +150,7 @@ metadata:
 spec:
   params:
   - name: OLM_UTILS_IMAGE
-    value: icr.io/cpopen/cpd/olm-utils-v2
+    value: icr.io/cpopen/cpd/olm-utils-v3
   - name: VERSION
     value: 4.8.5
   - name: COMPONENTS
@@ -205,7 +205,7 @@ spec:
 
   - You need to provide at least your **IBM Entitlement key** ([link to get your key](https://myibm.ibm.com/products-services/containerlibrary))
   - You can change the version, name of namespaces or storageclass to use
-  - [list of available component](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=information-determining-which-components-install#collect-info-components__all-svcs)
+  - [list of available component](https://www.ibm.com/docs/en/cloud-paks/cp-data/5.0.x?topic=information-determining-which-components-install)
   - If you are not running a production service, set **production** to **false**
   - if you don’t have GPUs but still want to deploy watsonx, set **NO_GPU** to **true**
 

charts/cpd-install-pipeline/Chart.yaml

@@ -22,11 +22,11 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.5.6
+version: 2.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.5.6"
+appVersion: "2.0.0"
 #

charts/cpd-install-pipeline/README.md

@@ -2,7 +2,7 @@
 
 Install automatically IBM Cloudpak for Data using Tekton Pipeline
 
-<img width="1688" alt="image" src="https://github.com/schabrolles/cpd-install-pipeline/assets/19491077/520b9618-d833-49c4-ae52-1cb6777ed819">
+<img width="1708" alt="image" src="https://github.com/schabrolles/cpd-install-pipeline/assets/19491077/102ca157-3dce-4930-9c26-ce2058639eef">
 
 ## Prerequisite:
 
@@ -13,17 +13,45 @@ Install automatically IBM Cloudpak for Data using Tekton Pipeline
 ## Table of Content:
 
 - **Installation**
-   - cli based: [Using helm cli](#1--Configuring-cpd-install-Tekton-Pipeline-from-the-cli)
-   - GUI based: [Using openshift web-console](#1bis---Adding-helm-repo-to-openshift-to-use-Graphical-Interface)
+   - GUI based: [Using openshift web-console](#1--Adding-helm-repo-to-openshift-to-use-Graphical-Interface)
+   - cli based: [Using helm cli](#1bis--Configuring-cpd-install-Tekton-Pipeline-from-the-cli)
+
 - **Starting Pipeline**
    - GUI based: [Using openshift pipeline graphical interface](#2--Starting-pipeline-with-GUI)
    - cli based: [applying pipelineRun yaml file](2bis--Starting-pipeline-from-cli-(by-applying-YAML))
 
 ## Installation
-* 1- [Using helm cli](#1--Configuring-cpd-install-Tekton-Pipeline-from-the-cli) (cli based)
-* 1bis- [Using openshift web-console](#1bis---Adding-helm-repo-to-openshift-to-use-Graphical-Interface) (GUI based)
+The easiest way to install the pipeline is to add this helm registry to your openshift cluster.  
+**You must have acces to internet for this.**  
+For airgap mod, please use the helm cli and download the archive from [release page](https://github.com/schabrolles/cpd-install-pipeline/releases)
+
+### 1- Adding helm repo to openshift to use Graphical Interface
+
+apply the following yaml to add the helm repo in openshift (with `oc apply` or on the openshift console by clicking on the "**+**" button on the black banner at the top right-end corner of the screen. 
+```
+apiVersion: helm.openshift.io/v1beta1
+kind: HelmChartRepository
+metadata:
+  name: cpd-install-pipeline
+spec:
+  connectionConfig:
+    url: 'https://schabrolles.github.io/cpd-install-pipeline'
+```
+
+- Then create a project: `cp-install`for example.
+- Switch to **developer view** / **add**
+- Select Helm charts and search for cp-install
+
+<img width="1856" alt="image" src="https://github.com/schabrolles/cpd-install-pipeline/assets/19491077/b15b43fd-3d01-405e-a602-b61a87bab204">
+
+- Click on **Create**
+
+<img width="1491" alt="image" src="https://github.com/schabrolles/cpd-install-pipeline/assets/19491077/0cc8c07d-0602-473e-81a6-75d8f7144e56">
+
+- Select the Chart version you want.
+- **if you Run on Power or Z, set the arch value before validating**
 
-### 1- Configuring cpd-install Tekton Pipeline from the cli
+### 1bis- Configuring cpd-install Tekton Pipeline from the cli
 
 After having installed the openshift-pipeline operator, use helm to deploy the tasks and pipeline in a namespace of your cluster.
 
@@ -47,35 +75,9 @@ helm install cpd-install cpd-install-pipeline/cpd-install-pipeline \
 This will:
    - create a project `cpd-install`
    - give the **::“cluster-admin”::** right to the “**pipeline**” service-account of this project
-   - create a tekton task “**olm-utils**” based on the official `olm-utils-v2` from IBM (icr.io)
+   - create a tekton task “**olm-utils**” based on the official `olm-utils-v3` from IBM (icr.io)
    - create a tekton pipeline to install automatically the cloud pak for data `components` you choose
 
-### 1bis - Adding helm repo to openshift to use Graphical Interface
-
-apply the following yaml to add the helm repo in openshift.
-```
-apiVersion: helm.openshift.io/v1beta1
-kind: HelmChartRepository
-metadata:
-  name: cpd-install-pipeline
-spec:
-  connectionConfig:
-    url: 'https://schabrolles.github.io/cpd-install-pipeline'
-```
-
-- Then create a project: `cp-install`for example.
-- Switch to **developer view** / **add**
-- Select Helm charts and search for cp-install
-
-<img width="1856" alt="image" src="https://github.com/schabrolles/cpd-install-pipeline/assets/19491077/b15b43fd-3d01-405e-a602-b61a87bab204">
-
-- Click on **Create**
-
-<img width="1491" alt="image" src="https://github.com/schabrolles/cpd-install-pipeline/assets/19491077/0cc8c07d-0602-473e-81a6-75d8f7144e56">
-
-- Select the Chart version you want.
-- **if you Run on Power or Z, set the arch value before validating**
-
 ## Starting the pipeline
 * 2- [Using openshift pipeline graphical interface](#2--Starting-pipeline-with-GUI) (GUI based)
 * 2bis- [applying pipelineRun yaml file](2bis--Starting-pipeline-from-cli-(by-applying-YAML)) (cli based)
@@ -104,7 +106,7 @@ This will open a forms to customize your installation.
 
 - You need to provide at least your **IBM Entitlement key**
 - You can change the version, name of namespaces or storageclass to use
-- [list of available component](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=information-determining-which-components-install#collect-info-components__all-svcs)
+- [list of available component](https://www.ibm.com/docs/en/cloud-paks/cp-data/5.0.x?topic=information-determining-which-components-install)
 - If you are not running a production service, set **production** to **false**
 - if you don’t have GPUs but still want to deploy watsonx, set **NO_GPU** to **true**
 
@@ -148,7 +150,7 @@ metadata:
 spec:
   params:
   - name: OLM_UTILS_IMAGE
-    value: icr.io/cpopen/cpd/olm-utils-v2
+    value: icr.io/cpopen/cpd/olm-utils-v3
   - name: VERSION
     value: 4.8.5
   - name: COMPONENTS
@@ -203,6 +205,7 @@ spec:
 
   - You need to provide at least your **IBM Entitlement key** ([link to get your key](https://myibm.ibm.com/products-services/containerlibrary))
   - You can change the version, name of namespaces or storageclass to use
+  - [list of available component](https://www.ibm.com/docs/en/cloud-paks/cp-data/5.0.x?topic=information-determining-which-components-install)
   - If you are not running a production service, set **production** to **false**
   - if you don’t have GPUs but still want to deploy watsonx, set **NO_GPU** to **true**
 

charts/cpd-install-pipeline/templates/NOTES.txt

@@ -20,7 +20,7 @@ metadata:
 spec:
   params:
   - name: OLM_UTILS_IMAGE
-    value: icr.io/cpopen/cpd/olm-utils-v2
+    value: icr.io/cpopen/cpd/olm-utils-v3
   - name: VERSION
     value: {{ .Values.cpd_version }}
   - name: COMPONENTS

charts/cpd-install-pipeline/templates/cpd-add-components-pipeline.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   params:
-    - default: icr.io/cpopen/cpd/olm-utils-v2
+    - default: icr.io/cpopen/cpd/olm-utils-v3
       description: olm-utils images
       name: OLM_UTILS_IMAGE
       type: string

charts/cpd-install-pipeline/templates/cpd-check-pipeline.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   params:
-    - default: icr.io/cpopen/cpd/olm-utils-v2
+    - default: icr.io/cpopen/cpd/olm-utils-v3
       description: olm-utils images
       name: OLM_UTILS_IMAGE
       type: string

charts/cpd-install-pipeline/templates/cpd-delete-instance-pipeline.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   params:
-    - default: icr.io/cpopen/cpd/olm-utils-v2
+    - default: icr.io/cpopen/cpd/olm-utils-v3
       description: olm-utils images
       name: OLM_UTILS_IMAGE
       type: string
@@ -72,36 +72,6 @@ spec:
             --cpd_operator_ns=$(params.PROJECT_CPD_INST_OPERANDS) \
             --delete_all_components=true
 
-            oc delete crd analyticsengines.ae.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd ccs.ccs.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd datarefinery.datarefinery.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd db2oltpservices.databases.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd db2whservices.databases.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd dods.dods.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd ibmcpds.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd notebookruntimes.ws.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd rstudioaddons.rstudio.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd wmlbases.wml.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd ws.ws.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd zenextensions.zen.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd zenservices.zen.cpd.ibm.com \
-            --ignore-not-found=true
-            oc delete crd scheduling.scheduler.spectrumcomputing.ibm.com \
-            --ignore-not-found=true
-            oc delete crd mcschedulings.scheduler.spectrumcomputing.ibm.com \
-            --ignore-not-found=true
       runAfter:
         - components-delete-cr
       taskRef:

charts/cpd-install-pipeline/templates/cpd-install-pipeline.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   params:
-    - default: icr.io/cpopen/cpd/olm-utils-v2
+    - default: icr.io/cpopen/cpd/olm-utils-v3
       description: olm-utils images
       name: OLM_UTILS_IMAGE
       type: string

charts/cpd-install-pipeline/templates/cpd-remove-components-pipeline.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   params:
-    - default: icr.io/cpopen/cpd/olm-utils-v2
+    - default: icr.io/cpopen/cpd/olm-utils-v3
       description: olm-utils images
       name: OLM_UTILS_IMAGE
       type: string

charts/cpd-install-pipeline/templates/cpd-restart-pipeline.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   params:
-    - default: icr.io/cpopen/cpd/olm-utils-v2
+    - default: icr.io/cpopen/cpd/olm-utils-v3
       description: olm-utils images
       name: OLM_UTILS_IMAGE
       type: string

charts/cpd-install-pipeline/templates/cpd-shutdown-pipeline.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   params:
-    - default: icr.io/cpopen/cpd/olm-utils-v2
+    - default: icr.io/cpopen/cpd/olm-utils-v3
       description: olm-utils images
       name: OLM_UTILS_IMAGE
       type: string

charts/cpd-install-pipeline/templates/install-option-cm.yaml

@@ -7,11 +7,13 @@ data:
   install-options.yml: |
     ###################################################################################
     # Parameters description:
-    # https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=data-specifying-installation-options-services
+    # https://www.ibm.com/docs/en/cloud-paks/cp-data/5.0.x?topic=services-specifying-installation-options#install-platform-param-file__watsonxai-parms
     ###################################################################################
     custom_spec:
       cpd_platform:
         iamIntegration: true
+      watsonx_ai:
+        tuning_disabled: false
       watsonx_governance:
         installType: all
         enableFactsheet: true

charts/cpd-install-pipeline/templates/olm-utilstask.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   params:
-  - default: icr.io/cpopen/cpd/olm-utils-v2
+  - default: icr.io/cpopen/cpd/olm-utils-v3
     description: olm-utils image
     name: OLM_UTILS_IMAGE
     type: string

charts/cpd-install-pipeline/templates/tekton-patch-pipeline.yaml

@@ -6,7 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   params:
-    - default: icr.io/cpopen/cpd/olm-utils-v2
+    - default: icr.io/cpopen/cpd/olm-utils-v3
       description: olm-utils images
       name: OLM_UTILS_IMAGE
       type: string

charts/cpd-install-pipeline/templates/tekton-patch-pipelineRun.yaml

@@ -11,7 +11,7 @@ spec:
     name: tekton-patch
   params:
     - name: OLM_UTILS_IMAGE
-      value: icr.io/cpopen/cpd/olm-utils-v2
+      value: icr.io/cpopen/cpd/olm-utils-v3
     - name: VERSION
       value: {{ .Values.cpd_version }}
 {{- end -}}

charts/cpd-install-pipeline/values.schema.json

@@ -7,7 +7,7 @@
       "default": "x86"
     },
     "cdp_version": {
-      "enum": ["4.8.5", "4.8.4", "4.8.3"],
+      "enum": ["5.0.0.", "4.8.5", "4.8.4"],
       "description": "cpd version to set as default in your pipelines"
     },
     "default_cpd_install": {

charts/cpd-install-pipeline/values.yaml

@@ -6,7 +6,7 @@
 arch: "x86"
 
 # Cloudpak for Data / OLM version to set as default in pipelines
-cpd_version: "4.8.5"
+cpd_version: "5.0.0"
 
 # Cloud pak for Data mode to set as default in pipelines: cpd-enterprise, watsonx
 default_cpd_install: "cpd"