From 49b285a794f9fc1a9c3bdc3008e7c9efe1fc88a7 Mon Sep 17 00:00:00 2001 From: atheo89 Date: Tue, 12 Mar 2024 16:47:53 +0100 Subject: [PATCH] Update RStudio Notebook --- manifests/base/commit.env | 2 +- manifests/base/kustomization.yaml | 14 ++++++++++++++ manifests/base/params.env | 4 ++-- .../base/rstudio-gpu-notebook-imagestream.yaml | 10 +++++----- manifests/base/rstudio-notebook-imagestream.yaml | 8 ++++---- rstudio/c9s-python-3.9/Dockerfile | 12 ++++++------ 6 files changed, 32 insertions(+), 18 deletions(-) diff --git a/manifests/base/commit.env b/manifests/base/commit.env index 527baf3df..73cb50d6c 100644 --- a/manifests/base/commit.env +++ b/manifests/base/commit.env @@ -19,6 +19,6 @@ odh-habana-notebook-image-commit-n=e5b5f1f odh-codeserver-notebook-image-commit-n=47251a7 odh-codeserver-notebook-image-commit-n-1=c21f66d odh-rstudio-notebook-image-commit-n=47251a7 -odh-rstudio-notebook-image-commit-n-1=c21f66d +odh-rstudio-notebook-image-commit-n-1=47251a7 odh-rstudio-gpu-notebook-image-commit-n=47251a7 odh-rstudio-gpu-notebook-image-commit-n-1=c21f66d diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml index 834c5dcd3..801282c9a 100644 --- a/manifests/base/kustomization.yaml +++ b/manifests/base/kustomization.yaml @@ -179,6 +179,13 @@ vars: apiVersion: v1 fieldref: fieldpath: data.odh-rstudio-notebook-n-1 + - name: odh-rstudio-notebook-n-2 + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: data.odh-rstudio-notebook-n-2 - name: odh-rstudio-gpu-notebook-n objref: kind: ConfigMap @@ -193,6 +200,13 @@ vars: apiVersion: v1 fieldref: fieldpath: data.odh-rstudio-gpu-notebook-n-1 + - name: odh-rstudio-gpu-notebook-n-2 + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: data.odh-rstudio-gpu-notebook-n-2 - name: odh-minimal-notebook-image-commit-n objref: kind: ConfigMap diff --git a/manifests/base/params.env b/manifests/base/params.env index 6b5379c86..4d6014739 100644 --- a/manifests/base/params.env +++ b/manifests/base/params.env @@ -19,6 +19,6 @@ odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:b0821ae2 odh-codeserver-notebook-n=quay.io/opendatahub/workbench-images@sha256:8110cd945161df22aa4c62cd9fb6e2ba2c84699a0c260e990df74fd4e5dd97de odh-codeserver-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:c6423559bb7c0299e684e2dcf548d80a3832861fb11bc0a78b4db7449252d44e odh-rstudio-notebook-n=quay.io/opendatahub/workbench-images@sha256:57d907349cbf1640ad2b6099a2e9fc3ddcf337e401f0e6d2bfd4e8883f4ec6fb -odh-rstudio-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:fd9bfb6401a92101560e4f7ace0f3a2ec9f1c3021e33e3b1ee070c9ed0b01604 +odh-rstudio-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:57d907349cbf1640ad2b6099a2e9fc3ddcf337e401f0e6d2bfd4e8883f4ec6fb odh-rstudio-gpu-notebook-n=quay.io/opendatahub/workbench-images@sha256:975b218f376a0f09ceb7c57f0a6cc15dfd10492f779349a23e5d72b0eeb53ade -odh-rstudio-gpu-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:f6afec8733c1143110d10b1886e27321d73facbef975805f7f36fff7fb697c49 +odh-rstudio-gpu-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:975b218f376a0f09ceb7c57f0a6cc15dfd10492f779349a23e5d72b0eeb53ade diff --git a/manifests/base/rstudio-gpu-notebook-imagestream.yaml b/manifests/base/rstudio-gpu-notebook-imagestream.yaml index 0e36931d0..2b283d16b 100644 --- a/manifests/base/rstudio-gpu-notebook-imagestream.yaml +++ b/manifests/base/rstudio-gpu-notebook-imagestream.yaml @@ -17,7 +17,7 @@ spec: tags: # N Version of the image - annotations: - opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"R","version":"v4.3"},{"name":"Python","version":"v3.9"}]' + opendatahub.io/notebook-software: '[{"name":"CUDA","version":"12.1"},{"name":"R","version":"v4.3"},{"name":"Python","version":"v3.9"}]' opendatahub.io/notebook-python-dependencies: '[{"name":"rstudio-server","version":"4.3"}]' openshift.io/imported-from: quay.io/opendatahub/workbench-images opendatahub.io/workbench-image-recommended: 'true' @@ -25,12 +25,12 @@ spec: from: kind: DockerImage name: $(odh-rstudio-gpu-notebook-n) - name: "2023.2" + name: "2024.1" referencePolicy: type: Source - # N - 1 Version of the image + # N Version of the image - annotations: - opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"}]' + opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"R","version":"v4.3"},{"name":"Python","version":"v3.9"}]' opendatahub.io/notebook-python-dependencies: '[{"name":"rstudio-server","version":"4.3"}]' openshift.io/imported-from: quay.io/opendatahub/workbench-images opendatahub.io/workbench-image-recommended: 'false' @@ -38,6 +38,6 @@ spec: from: kind: DockerImage name: $(odh-rstudio-gpu-notebook-n-1) - name: "2023.1" + name: "2023.2" referencePolicy: type: Source diff --git a/manifests/base/rstudio-notebook-imagestream.yaml b/manifests/base/rstudio-notebook-imagestream.yaml index 4d7e6f2c3..cb71ac6a7 100644 --- a/manifests/base/rstudio-notebook-imagestream.yaml +++ b/manifests/base/rstudio-notebook-imagestream.yaml @@ -14,7 +14,7 @@ spec: lookupPolicy: local: true tags: - # N Version of the image + # N Version of the image - annotations: opendatahub.io/notebook-software: '[{"name":"R","version":"v4.3"},{"name":"Python","version":"v3.9"}]' opendatahub.io/notebook-python-dependencies: '[{"name":"rstudio-server","version":"4.3"}]' @@ -24,12 +24,12 @@ spec: from: kind: DockerImage name: $(odh-rstudio-notebook-n) - name: "2023.2" + name: "2024.1" referencePolicy: type: Source # N - 1 Version of the image - annotations: - opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]' + opendatahub.io/notebook-software: '[{"name":"R","version":"v4.3"},{"name":"Python","version":"v3.9"}]' opendatahub.io/notebook-python-dependencies: '[{"name":"rstudio-server","version":"4.3"}]' openshift.io/imported-from: quay.io/opendatahub/workbench-images opendatahub.io/workbench-image-recommended: 'false' @@ -37,6 +37,6 @@ spec: from: kind: DockerImage name: $(odh-rstudio-notebook-n-1) - name: "2023.1" + name: "2023.2" referencePolicy: type: Source diff --git a/rstudio/c9s-python-3.9/Dockerfile b/rstudio/c9s-python-3.9/Dockerfile index 6a3348486..be119104c 100644 --- a/rstudio/c9s-python-3.9/Dockerfile +++ b/rstudio/c9s-python-3.9/Dockerfile @@ -13,7 +13,7 @@ LABEL name="odh-notebook-rstudio-server-c9s-python-3.9" \ USER 0 -ENV R_VERSION=4.3.1 +ENV R_VERSION=4.3.3 # Install R RUN yum install -y yum-utils && \ @@ -37,9 +37,9 @@ ENV R_LIBS_USER /opt/app-root/src/Rpackages/4.3 WORKDIR /tmp/ # Install RStudio -RUN wget --progress=dot:giga https://download2.rstudio.org/server/rhel9/x86_64/rstudio-server-rhel-2023.06.1-524-x86_64.rpm && \ - yum install -y rstudio-server-rhel-2023.06.1-524-x86_64.rpm && \ - rm rstudio-server-rhel-2023.06.1-524-x86_64.rpm && \ +RUN wget --progress=dot:giga https://download2.rstudio.org/server/rhel9/x86_64/rstudio-server-rhel-2023.12.1-402-x86_64.rpm && \ + yum install -y rstudio-server-rhel-2023.12.1-402-x86_64.rpm && \ + rm rstudio-server-rhel-2023.12.1-402-x86_64.rpm && \ yum -y clean all --enablerepo='*' # Specific RStudio config and fixes @@ -53,8 +53,8 @@ RUN dnf install -y libsodium-devel.x86_64 libgit2-devel.x86_64 libcurl-devel har RUN R -e "install.packages('Rcpp')" # Install NGINX to proxy RStudio and pass probes check -ENV NGINX_VERSION=1.22 \ - NGINX_SHORT_VER=122 \ +ENV NGINX_VERSION=1.24 \ + NGINX_SHORT_VER=124 \ NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \ NGINX_CONF_PATH=/etc/nginx/nginx.conf \ NGINX_DEFAULT_CONF_PATH=${APP_ROOT}/etc/nginx.default.d \