Skip to content

Sync changes from odh:main to rhds:main #1639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 17, 2025
Merged

Sync changes from odh:main to rhds:main #1639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9af1da6
RHAIENG-1440: Upgrade packages for latest stable (#2584)
daniellutz Oct 17, 2025
3b8d23e
Disable 2025.1 image for Code Server and Rstudio
harshad16 Oct 17, 2025
ced6344
RHOAIENG-34310: support odh gateway auth with adjusting code-server a…
harshad16 Oct 17, 2025
3756f5d
Merge pull request #2590 from harshad16/disable-2025.1
atheo89 Oct 17, 2025
542b67a
Merge branch 'main' of https://github.com/opendatahub-io/notebooks in…
atheo89 Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions codeserver/ubi9-python-3.12/nginx/serverconf/proxy.conf.template_nbprefix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# api calls from probes get to code-server /healthz endpoint
###############
location = ${NB_PREFIX}/api {
return 302 /codeserver/healthz/;
return 302 ${NB_PREFIX}/codeserver/healthz/;
access_log off;
}

location ${NB_PREFIX}/api/ {
return 302 /codeserver/healthz/;
return 302 ${NB_PREFIX}/codeserver/healthz/;
access_log off;
}
###############
Expand All @@ -16,12 +16,12 @@ location ${NB_PREFIX}/api/ {
# api calls from culler get to CGI processing
###############
location = ${NB_PREFIX}/api/kernels {
return 302 $custom_scheme://$http_host/api/kernels/;
return 302 $custom_scheme://$http_host${NB_PREFIX}/api/kernels/;
access_log off;
}

location ${NB_PREFIX}/api/kernels/ {
return 302 $custom_scheme://$http_host/api/kernels/;
return 302 $custom_scheme://$http_host${NB_PREFIX}/api/kernels/;
access_log off;
}

Expand All @@ -39,32 +39,34 @@ location /api/kernels/ {
###############
# root and prefix get to code-server endpoint
###############
location = ${NB_PREFIX} {
return 302 $custom_scheme://$http_host/codeserver/;
}

location ${NB_PREFIX}/ {
return 302 $custom_scheme://$http_host/codeserver/;
location ${NB_PREFIX} {
return 302 $custom_scheme://$http_host${NB_PREFIX}/codeserver/;
}

location = /codeserver {
return 302 $custom_scheme://$http_host/codeserver/;
return 302 $custom_scheme://$http_host${NB_PREFIX}/codeserver/;
}

location = / {
return 302 $custom_scheme://$http_host/codeserver/;
return 302 $custom_scheme://$http_host${NB_PREFIX}/codeserver/;
}

location /codeserver/ {
rewrite ^/codeserver/(.*)$ /$1 break;
# Standard RStudio/NGINX configuration
location ${NB_PREFIX}/codeserver/ {
rewrite ^${NB_PREFIX}/codeserver/(.*)$ /$1 break;
# Standard code-server/NGINX configuration
proxy_pass http://workbench_server/;
proxy_http_version 1.1;

proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_read_timeout 20d;

# Needed to make it work properly
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $custom_scheme;
proxy_set_header Host $http_host;
proxy_set_header X-NginX-Proxy true;
proxy_redirect off;

access_log /var/log/nginx/codeserver.access.log json if=$loggable;
}
Expand Down
509 changes: 264 additions & 245 deletions codeserver/ubi9-python-3.12/pylock.toml
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions codeserver/ubi9-python-3.12/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ dependencies = [
"setuptools~=80.9.0",

# Datascience packages
"boto3~=1.40.27",
"boto3~=1.40.52",
"kafka-python-ng~=2.2.3",
"matplotlib~=3.10.6",
"numpy~=2.3.3",
"pandas~=2.3.2",
"plotly~=6.3.0",
"matplotlib~=3.10.7",
"numpy~=2.3.4",
"pandas~=2.3.3",
"plotly~=6.3.1",
"scikit-learn~=1.7.2",
"scipy~=1.16.1",
"scipy~=1.16.2",
"skl2onnx~=1.19.1; platform_machine != 's390x'",
"ipykernel~=6.30.1",
"kubeflow-training==1.9.3",
Expand All @@ -25,9 +25,9 @@ dependencies = [
# Some extra useful packages
"opencensus~=0.11.4",
"smart-open~=7.3.1",
"virtualenv~=20.34.0",
"virtualenv~=20.35.3",
"py-spy~=0.4.1; platform_machine != 's390x'",
"prometheus-client~=0.22.1",
"prometheus-client~=0.23.1",
]

[tool.uv]
Expand Down
6 changes: 5 additions & 1 deletion codeserver/ubi9-python-3.12/run-nginx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ fi
if [ -z "$NB_PREFIX" ]; then
cp /opt/app-root/etc/nginx.default.d/proxy.conf.template /opt/app-root/etc/nginx.default.d/proxy.conf
else
export BASE_URL=$(echo $NB_PREFIX | awk -F/ '{ print $4"-"$3 }')$(echo $NOTEBOOK_ARGS | grep -Po 'hub_host":"\K.*?(?=")' | awk -F/ '{ print $3 }' | awk -F. '{for (i=2; i<=NF; i++) printf ".%s", $i}')
export BASE_URL=$(echo "$NB_PREFIX" | awk -F/ '{ print $4"-"$3 }')$(echo "$NOTEBOOK_ARGS" | grep -Po 'hub_host":"\K.*?(?=")' | awk -F/ '{ print $3 }' | awk -F. '{for (i=2; i<=NF; i++) printf ".%s", $i}')
# If BASE_URL is empty or invalid (missing hub_host), use wildcard server_name
if [ -z "$BASE_URL" ] || [ "$BASE_URL" = "$(echo "$NB_PREFIX" | awk -F/ '{ print $4"-"$3 }')" ]; then
export BASE_URL="_"
fi
envsubst '${NB_PREFIX},${BASE_URL}' < /opt/app-root/etc/nginx.default.d/proxy.conf.template_nbprefix > /opt/app-root/etc/nginx.default.d/proxy.conf
envsubst '${BASE_URL}' < /etc/nginx/nginx.conf | tee /etc/nginx/nginx.conf
fi
Expand Down
651 changes: 342 additions & 309 deletions jupyter/datascience/ubi9-python-3.12/pylock.toml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions jupyter/datascience/ubi9-python-3.12/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@ requires-python = "==3.12.*"

dependencies = [
# Datascience and useful extensions
"boto3~=1.40.27",
"boto3~=1.40.52",
"kafka-python-ng~=2.2.3",
"kfp~=2.14.3",
"matplotlib~=3.10.6",
"numpy~=2.3.3",
"pandas~=2.3.2",
"plotly~=6.3.0",
"kfp~=2.14.6",
"matplotlib~=3.10.7",
"numpy~=2.3.4",
"pandas~=2.3.3",
"plotly~=6.3.1",
"scikit-learn~=1.7.2",
"scipy~=1.16.1",
"scipy~=1.16.2",
"skl2onnx~=1.19.1",
"onnxconverter-common~=1.13.0", # Required for skl2onnx, as upgraded version is not compatible with protobuf
"kubeflow-training==1.9.3",
"codeflare-sdk~=0.32.0; platform_machine != 'ppc64le' and platform_machine != 's390x'",
"feast~=0.55.0",

# DB connectors
"pymongo~=4.14.1",
"pymongo~=4.15.3",
"psycopg~=3.2.10",
"pyodbc~=5.2.0",
"mysql-connector-python~=9.4.0",

# JupyterLab packages
"odh-elyra==4.2.5",
"odh-elyra==4.3.1",
"odh-jupyter-trash-cleanup==0.1.1",

"jupyterlab==4.4.7",
"jupyterlab==4.4.9",
"jupyter-bokeh~=4.0.5",
"jupyter-server~=2.17.0",
"jupyter-server-proxy~=4.4.0",
Expand Down
6 changes: 3 additions & 3 deletions jupyter/minimal/ubi9-python-3.12/pylock.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,9 +706,9 @@ wheels = [{ url = "https://files.pythonhosted.org/packages/07/2d/2b32cdbe8d2a602

[[packages]]
name = "jupyterlab"
version = "4.4.7"
sdist = { url = "https://files.pythonhosted.org/packages/d0/07/b3beaeb5722d4a55e345a38884c67baebd9cec2269c5309ce494485a5858/jupyterlab-4.4.7.tar.gz", upload-time = 2025-09-03T13:26:40Z, size = 22965570, hashes = { sha256 = "8c8e225492f4513ebde9bbbc00a05b651ab9a1f5b0013015d96fabf671c37188" } }
wheels = [{ url = "https://files.pythonhosted.org/packages/7e/01/44f35124896dd5c73b26705c25bb8af2089895b32f057a1e4a3488847333/jupyterlab-4.4.7-py3-none-any.whl", upload-time = 2025-09-03T13:26:35Z, size = 12291583, hashes = { sha256 = "808bae6136b507a4d18f04254218bfe71ed8ba399a36ef3280d5f259e69abf80" } }]
version = "4.4.9"
sdist = { url = "https://files.pythonhosted.org/packages/45/b2/7dad2d0049a904d17c070226a4f78f81905f93bfe09503722d210ccf9335/jupyterlab-4.4.9.tar.gz", upload-time = 2025-09-26T17:28:20Z, size = 22966654, hashes = { sha256 = "ea55aca8269909016d5fde2dc09b97128bc931230183fe7e2920ede5154ad9c2" } }
wheels = [{ url = "https://files.pythonhosted.org/packages/1f/fd/ac0979ebd1b1975c266c99b96930b0a66609c3f6e5d76979ca6eb3073896/jupyterlab-4.4.9-py3-none-any.whl", upload-time = 2025-09-26T17:28:15Z, size = 12292552, hashes = { sha256 = "394c902827350c017430a8370b9f40c03c098773084bc53930145c146d3d2cb2" } }]

[[packages]]
name = "jupyterlab-git"
Expand Down
2 changes: 1 addition & 1 deletion jupyter/minimal/ubi9-python-3.12/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies = [
# JupyterLab packages
"odh-jupyter-trash-cleanup==0.1.1",

"jupyterlab==4.4.7",
"jupyterlab==4.4.9",
"jupyter-server~=2.17.0",
"jupyter-server-proxy~=4.4.0",
"jupyter-server-terminals~=0.5.3",
Expand Down
Loading
Loading