Merge pull request #42 from harshad16/sync-up

Sync main branch with opendatahub notebook main
red-hat-data-services · Jul 14, 2023 · 38d2bc5 · 38d2bc5
2 parents 67b5d17 + 7d32ff7
commit 38d2bc5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/jupyter/datascience/ubi9-python-3.9/Dockerfile b/jupyter/datascience/ubi9-python-3.9/Dockerfile
@@ -36,7 +36,7 @@ RUN mkdir /opt/app-root/runtimes && \
     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
+    # 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 && \
     # switch to Data Science Pipeline in component catalog \

diff --git a/jupyter/datascience/ubi9-python-3.9/utils/processor_kfp.patch b/jupyter/datascience/ubi9-python-3.9/utils/processor_kfp.patch
@@ -1,5 +1,5 @@
---- a/processor_kfp.py	2023-06-09 10:17:15.659461927 -0400
-+++ b/processor_kfp.py	2023-06-09 10:16:20.062429914 -0400
+--- a/processor_kfp.py	2023-06-09 10:19:08.882563609 -0400
++++ b/processor_kfp.py	2023-07-13 19:31:43.572407879 -0400
 @@ -213,6 +213,7 @@
                      credentials=auth_info.get("credentials", None),
                      existing_token=auth_info.get("existing_token", None),
@@ -8,3 +8,31 @@
                  )
              else:
                  client = ArgoClient(
+@@ -416,7 +417,7 @@
+
+                 # create pipeline run (or specified pipeline version)
+                 run = client.run_pipeline(
+-                    experiment_id=experiment.id, job_name=job_name, pipeline_id=pipeline_id, version_id=version_id
++                    experiment_id=experiment.id, job_name=job_name, pipeline_id=pipeline_id, version_id=pipeline_id
+                 )
+
+             except Exception as ex:
+@@ -435,7 +436,7 @@
+
+             self.log_pipeline_info(
+                 pipeline_name,
+-                f"pipeline submitted: {public_api_endpoint}/#/runs/details/{run.id}",
++                f"pipeline submitted: {public_api_endpoint}/{run.id}",
+                 duration=time.time() - t0,
+             )
+
+@@ -451,7 +452,7 @@
+
+         return KfpPipelineProcessorResponse(
+             run_id=run.id,
+-            run_url=f"{public_api_endpoint}/#/runs/details/{run.id}",
++            run_url=f"{public_api_endpoint}/{run.id}",
+             object_storage_url=object_storage_url,
+             object_storage_path=object_storage_path,
+
+         )