Remove .json files runtimes from DS notebook & removed the COPY instruction of them on the Dockerfile (#943)

atheo89 · web-flow · commit dfc2bf781b47 · 2025-04-10T19:23:05.000Z
* Remove .json files runtimes from DS notebook as well removed the COPY instruction of them on the Dockerfile

* Add runtimes imagestreams on the kustomization

* update after the rebase

* satisfy tekton pipelines
diff --git a/.tekton/cuda-jupyter-pytorch-ubi9-python-3-11-pull-request.yaml b/.tekton/cuda-jupyter-pytorch-ubi9-python-3-11-pull-request.yaml
@@ -14,8 +14,7 @@ metadata:
       == "main" && ( "cuda/NGC-DL-CONTAINER-LICENSE".pathChanged() || "cuda/cuda.repo-x86_64".pathChanged()
       || "jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64".pathChanged()
       || "jupyter/datascience/ubi9-python-3.11/mssql-2022.repo-x86_64".pathChanged()
-      || "jupyter/datascience/ubi9-python-3.11/runtime-images/***".pathChanged() ||
-      "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
+      || "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
       || "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/pytorch/ubi9-python-3.11/Pipfile.lock".pathChanged()
       || "jupyter/utils/***".pathChanged() || ".tekton/cuda-jupyter-pytorch-ubi9-python-3-11-pull-request.yaml".pathChanged()
       || "jupyter/pytorch/ubi9-python-3.11/Dockerfile.cuda".pathChanged() ) && has(body.repository)
diff --git a/.tekton/cuda-jupyter-tensorflow-ubi9-python-3-11-pull-request.yaml b/.tekton/cuda-jupyter-tensorflow-ubi9-python-3-11-pull-request.yaml
@@ -14,8 +14,7 @@ metadata:
       == "main" && ( "cuda/NGC-DL-CONTAINER-LICENSE".pathChanged() || "cuda/cuda.repo-x86_64".pathChanged()
       || "jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64".pathChanged()
       || "jupyter/datascience/ubi9-python-3.11/mssql-2022.repo-x86_64".pathChanged()
-      || "jupyter/datascience/ubi9-python-3.11/runtime-images/***".pathChanged() ||
-      "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
+      || "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
       || "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/tensorflow/ubi9-python-3.11/Pipfile.lock".pathChanged()
       || "jupyter/utils/***".pathChanged() || ".tekton/cuda-jupyter-tensorflow-ubi9-python-3-11-pull-request.yaml".pathChanged()
       || "jupyter/tensorflow/ubi9-python-3.11/Dockerfile.cuda".pathChanged() ) &&
diff --git a/.tekton/jupyter-datascience-ubi9-python-3-11-pull-request.yaml b/.tekton/jupyter-datascience-ubi9-python-3-11-pull-request.yaml
@@ -14,8 +14,7 @@ metadata:
       == "main" && ( "jupyter/datascience/ubi9-python-3.11/Pipfile.lock".pathChanged()
       || "jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64".pathChanged()
       || "jupyter/datascience/ubi9-python-3.11/mssql-2022.repo-x86_64".pathChanged()
-      || "jupyter/datascience/ubi9-python-3.11/runtime-images/***".pathChanged() ||
-      "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
+      || "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
       || "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/utils/***".pathChanged()
       || ".tekton/jupyter-datascience-ubi9-python-3-11-pull-request.yaml".pathChanged()
       || "jupyter/datascience/ubi9-python-3.11/Dockerfile.cpu".pathChanged() ) &&
diff --git a/.tekton/jupyter-trustyai-ubi9-python-3-11-pull-request.yaml b/.tekton/jupyter-trustyai-ubi9-python-3-11-pull-request.yaml
@@ -13,8 +13,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
       == "main" && ( "jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64".pathChanged()
       || "jupyter/datascience/ubi9-python-3.11/mssql-2022.repo-x86_64".pathChanged()
-      || "jupyter/datascience/ubi9-python-3.11/runtime-images/***".pathChanged() ||
-      "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
+      || "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
       || "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/trustyai/ubi9-python-3.11/Pipfile.lock".pathChanged()
       || "jupyter/utils/***".pathChanged() || ".tekton/jupyter-trustyai-ubi9-python-3-11-pull-request.yaml".pathChanged()
       || "jupyter/trustyai/ubi9-python-3.11/Dockerfile.cpu".pathChanged() ) && has(body.repository)
diff --git a/.tekton/rocm-jupyter-pytorch-ubi9-python-3-11-pull-request.yaml b/.tekton/rocm-jupyter-pytorch-ubi9-python-3-11-pull-request.yaml
@@ -13,8 +13,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
       == "main" && ( "jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64".pathChanged()
       || "jupyter/datascience/ubi9-python-3.11/mssql-2022.repo-x86_64".pathChanged()
-      || "jupyter/datascience/ubi9-python-3.11/runtime-images/***".pathChanged() ||
-      "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
+      || "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
       || "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/rocm/pytorch/ubi9-python-3.11/Pipfile.lock".pathChanged()
       || "jupyter/rocm/pytorch/ubi9-python-3.11/de-vendor-torch.sh".pathChanged()
       || "jupyter/utils/***".pathChanged() || ".tekton/rocm-jupyter-pytorch-ubi9-python-3-11-pull-request.yaml".pathChanged()
diff --git a/.tekton/rocm-jupyter-tensorflow-ubi9-python-3-11-pull-request.yaml b/.tekton/rocm-jupyter-tensorflow-ubi9-python-3-11-pull-request.yaml
@@ -13,8 +13,7 @@ metadata:
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
       == "main" && ( "jupyter/datascience/ubi9-python-3.11/mongodb-org-6.0.repo-x86_64".pathChanged()
       || "jupyter/datascience/ubi9-python-3.11/mssql-2022.repo-x86_64".pathChanged()
-      || "jupyter/datascience/ubi9-python-3.11/runtime-images/***".pathChanged() ||
-      "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
+      || "jupyter/datascience/ubi9-python-3.11/setup-elyra.sh".pathChanged() || "jupyter/datascience/ubi9-python-3.11/utils/***".pathChanged()
       || "jupyter/minimal/ubi9-python-3.11/start-notebook.sh".pathChanged() || "jupyter/rocm/tensorflow/ubi9-python-3.11/Pipfile.lock".pathChanged()
       || "jupyter/utils/***".pathChanged() || ".tekton/rocm-jupyter-tensorflow-ubi9-python-3-11-pull-request.yaml".pathChanged()
       || "jupyter/rocm/tensorflow/ubi9-python-3.11/Dockerfile.rocm".pathChanged()
diff --git a/jupyter/datascience/ubi9-python-3.11/Dockerfile.cpu b/jupyter/datascience/ubi9-python-3.11/Dockerfile.cpu
@@ -104,7 +104,4 @@ RUN echo "Installing softwares and packages" && \
     chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
     fix-permissions /opt/app-root -P
 
-# Copy Elyra runtime-images definitions and set the version
-COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
-
 WORKDIR /opt/app-root/src
diff --git a/jupyter/datascience/ubi9-python-3.11/runtime-images/datascience-ubi9-py311.json b/jupyter/datascience/ubi9-python-3.11/runtime-images/datascience-ubi9-py311.json
diff --git a/jupyter/datascience/ubi9-python-3.11/runtime-images/pytorch-ubi9-py311.json b/jupyter/datascience/ubi9-python-3.11/runtime-images/pytorch-ubi9-py311.json
diff --git a/jupyter/datascience/ubi9-python-3.11/runtime-images/rocm-pytorch-ubi9-py311.json b/jupyter/datascience/ubi9-python-3.11/runtime-images/rocm-pytorch-ubi9-py311.json
diff --git a/jupyter/datascience/ubi9-python-3.11/runtime-images/rocm-tensorflow-ubi9-py311.json b/jupyter/datascience/ubi9-python-3.11/runtime-images/rocm-tensorflow-ubi9-py311.json
diff --git a/jupyter/datascience/ubi9-python-3.11/runtime-images/tensorflow-ubi9-py311.json b/jupyter/datascience/ubi9-python-3.11/runtime-images/tensorflow-ubi9-py311.json
diff --git a/jupyter/datascience/ubi9-python-3.11/runtime-images/ubi9-py311.json b/jupyter/datascience/ubi9-python-3.11/runtime-images/ubi9-py311.json
diff --git a/jupyter/pytorch/ubi9-python-3.11/Dockerfile.cuda b/jupyter/pytorch/ubi9-python-3.11/Dockerfile.cuda
@@ -236,8 +236,5 @@ RUN echo "Installing softwares and packages" && \
     chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
     fix-permissions /opt/app-root -P
 
-# Copy Elyra runtime-images definitions and set the version
-COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
-
 WORKDIR /opt/app-root/src
 
diff --git a/jupyter/rocm/pytorch/ubi9-python-3.11/Dockerfile.rocm b/jupyter/rocm/pytorch/ubi9-python-3.11/Dockerfile.rocm
@@ -153,8 +153,4 @@ RUN echo "Installing softwares and packages" && \
     chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
     fix-permissions /opt/app-root -P
 
-
-# Copy Elyra runtime-images definitions and set the version
-COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
-
-WORKDIR /opt/app-root/src
+WORKDIR /opt/app-root/src
diff --git a/jupyter/rocm/tensorflow/ubi9-python-3.11/Dockerfile.rocm b/jupyter/rocm/tensorflow/ubi9-python-3.11/Dockerfile.rocm
@@ -150,8 +150,4 @@ RUN echo "Installing softwares and packages" && \
     chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
     fix-permissions /opt/app-root -P
 
-
-# Copy Elyra runtime-images definitions and set the version
-COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
-
 WORKDIR /opt/app-root/src
diff --git a/jupyter/tensorflow/ubi9-python-3.11/Dockerfile.cuda b/jupyter/tensorflow/ubi9-python-3.11/Dockerfile.cuda
@@ -236,7 +236,4 @@ RUN echo "Installing softwares and packages" && \
     chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
     fix-permissions /opt/app-root -P
 
-# Copy Elyra runtime-images definitions and set the version
-COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
-
 WORKDIR /opt/app-root/src
diff --git a/jupyter/trustyai/ubi9-python-3.11/Dockerfile.cpu b/jupyter/trustyai/ubi9-python-3.11/Dockerfile.cpu
@@ -122,7 +122,3 @@ RUN echo "Installing softwares and packages" && \
     # Fix permissions to support pip in Openshift environments \
     chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
     fix-permissions /opt/app-root -P
-
-# Copy Elyra runtime-images definitions and set the version
-COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
-
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
@@ -14,6 +14,12 @@ resources:
   - jupyter-rocm-minimal-notebook-imagestream.yaml
   - jupyter-rocm-pytorch-notebook-imagestream.yaml
   - jupyter-rocm-tensorflow-notebook-imagestream.yaml
+  - runtime-datascience-imagestream.yaml
+  - runtime-minimal-imagestream.yaml
+  - runtime-pytorch-imagestream.yaml
+  - runtime-rocm-pytorch-imagestream.yaml
+  - runtime-rocm-tensorflow-imagestream.yaml
+  - runtime-tensorflow-imagestream.yaml
 
 commonLabels:
   opendatahub.io/component: "true"
