Merge pull request #467 from harshad16/upgrade-elyra

Upgrade Elyra with odh-elyra for kfp v2 support

Author: harshad16

jupyter/datascience/ubi8-python-3.8/Dockerfile

@@ -55,13 +55,6 @@ RUN mkdir /opt/app-root/runtimes && \
     sed -i "s/Kubeflow Pipelines/Data Science/g" /opt/app-root/lib/python3.8/site-packages/elyra/pipeline/runtime_type.py && \
     sed -i "s/Kubeflow Pipelines/Data Science Pipelines/g" /opt/app-root/lib/python3.8/site-packages/elyra/metadata/schemas/kfp.json && \
     sed -i "s/kubeflow-service/data-science-pipeline-service/g" /opt/app-root/lib/python3.8/site-packages/elyra/metadata/schemas/kfp.json && \
-    sed -i "s/\"default\": \"Argo\",/\"default\": \"Tekton\",/g" /opt/app-root/lib/python3.8/site-packages/elyra/metadata/schemas/kfp.json && \
-    # Workaround for passing ssl_sa_cert
-    patch /opt/app-root/lib/python3.8/site-packages/elyra/pipeline/kfp/kfp_authentication.py -i utils/kfp_authentication.patch && \
-    patch /opt/app-root/lib/python3.8/site-packages/elyra/pipeline/kfp/processor_kfp.py -i utils/processor_kfp.patch && \
-    # Workaround for elyra pipeline validation command
-    patch /opt/app-root/lib/python3.8/site-packages/elyra/cli/pipeline_app.py -i utils/pipeline_app.patch && \
-    patch /opt/app-root/lib/python3.8/site-packages/elyra/pipeline/pipeline_definition.py -i utils/pipeline_definition.patch && \
     # switch to Data Science Pipeline in component catalog \
     DIR_COMPONENT="/opt/app-root/lib/python3.8/site-packages/elyra/metadata/schemas/local-directory-catalog.json" && \
     FILE_COMPONENT="/opt/app-root/lib/python3.8/site-packages/elyra/metadata/schemas/local-file-catalog.json" && \

jupyter/datascience/ubi8-python-3.8/Pipfile

@@ -16,6 +16,7 @@ plotly = "~=5.20.0"
 scikit-learn = "~=1.3.2"
 scipy = "~=1.10.1"
 skl2onnx = "~=1.16.0"
+onnxconverter-common = "~=1.13.0" # Required for skl2onnx, as upgraded version is not compatible with protobuf
 codeflare-sdk = "~=0.14.1"
 
 # DB connectors
@@ -25,18 +26,15 @@ pyodbc = "~=5.1.0"
 mysql-connector-python = "~=8.3.0"
 
 # JupyterLab packages
-elyra-pipeline-editor-extension = ">=3.15.0"
-elyra-python-editor-extension = ">=3.15.0"
-elyra-code-snippet-extension = ">=3.15.0"
-kfp-tekton = "<1.6.0"
+odh-elyra = "~=3.16.1"
 
 jupyterlab = "~=3.6.7" # Wait on upgrade till plugins are ready
 jupyter-bokeh = "~=3.0.7" # Upgrade would bring in jupyterlab 4
 jupyter-server = "~=2.13.0"
 jupyter-server-proxy = "~=4.0.0" # Upgrade would bring in jupyterlab 4
 jupyter-server-terminals = "~=0.5.3"
 jupyterlab-git = "~=0.44.0"
-jupyterlab-lsp = "~=4.3.0"
+jupyterlab-lsp = "~=4.2.0"
 jupyterlab-widgets = "~=3.0.10"
 jupyter-resource-usage = "~=0.7.2"
 nbdime = "~=3.2.1"

jupyter/datascience/ubi8-python-3.8/Pipfile.lock

@@ -55,13 +55,6 @@ RUN mkdir /opt/app-root/runtimes && \
     sed -i "s/Kubeflow Pipelines/Data Science/g" /opt/app-root/lib/python3.9/site-packages/elyra/pipeline/runtime_type.py && \
     sed -i "s/Kubeflow Pipelines/Data Science Pipelines/g" /opt/app-root/lib/python3.9/site-packages/elyra/metadata/schemas/kfp.json && \
     sed -i "s/kubeflow-service/data-science-pipeline-service/g" /opt/app-root/lib/python3.9/site-packages/elyra/metadata/schemas/kfp.json && \
-    sed -i "s/\"default\": \"Argo\",/\"default\": \"Tekton\",/g" /opt/app-root/lib/python3.9/site-packages/elyra/metadata/schemas/kfp.json && \
-    # Workaround for passing ssl_sa_cert and to ensure that Elyra redirects to a correct pipeline run URL
-    patch /opt/app-root/lib/python3.9/site-packages/elyra/pipeline/kfp/kfp_authentication.py -i utils/kfp_authentication.patch && \
-    patch /opt/app-root/lib/python3.9/site-packages/elyra/pipeline/kfp/processor_kfp.py -i utils/processor_kfp.patch && \
-    # Workaround for elyra pipeline validation command
-    patch /opt/app-root/lib/python3.9/site-packages/elyra/cli/pipeline_app.py -i utils/pipeline_app.patch && \
-    patch /opt/app-root/lib/python3.9/site-packages/elyra/pipeline/pipeline_definition.py -i utils/pipeline_definition.patch && \
     # switch to Data Science Pipeline in component catalog \
     DIR_COMPONENT="/opt/app-root/lib/python3.9/site-packages/elyra/metadata/schemas/local-directory-catalog.json" && \
     FILE_COMPONENT="/opt/app-root/lib/python3.9/site-packages/elyra/metadata/schemas/local-file-catalog.json" && \

jupyter/datascience/ubi9-python-3.9/Dockerfile

@@ -16,6 +16,7 @@ plotly = "~=5.20.0"
 scikit-learn = "~=1.4.0"
 scipy = "~=1.12.0"
 skl2onnx = "~=1.16.0"
+onnxconverter-common = "~=1.13.0" # Required for skl2onnx, as upgraded version is not compatible with protobuf
 codeflare-sdk = "~=0.14.1"
 
 # DB connectors
@@ -25,18 +26,15 @@ pyodbc = "~=5.1.0"
 mysql-connector-python = "~=8.3.0"
 
 # JupyterLab packages
-elyra-pipeline-editor-extension = ">=3.15.0"
-elyra-python-editor-extension = ">=3.15.0"
-elyra-code-snippet-extension = ">=3.15.0"
-kfp-tekton = "<1.6.0"
+odh-elyra = "~=3.16.1"
 
 jupyterlab = "~=3.6.7" # Wait on upgrade till plugins are ready
 jupyter-bokeh = "~=3.0.7" # Upgrade would bring in jupyterlab 4
 jupyter-server = "~=2.13.0"
 jupyter-server-proxy = "~=4.0.0" # Upgrade would bring in jupyterlab 4
 jupyter-server-terminals = "~=0.5.3"
 jupyterlab-git = "~=0.44.0"
-jupyterlab-lsp = "~=4.3.0"
+jupyterlab-lsp = "~=4.2.0"
 jupyterlab-widgets = "~=3.0.10"
 jupyter-resource-usage = "~=0.7.2"
 nbdime = "~=3.2.1"