Merge remote-tracking branch 'upstream/main' into rhoai-3.0

Author: CFSNM

codeserver/ubi9-python-3.12/test/test_startup.py

@@ -39,7 +39,6 @@ def get_notebook_args_configuration(self) -> str:
                 "--ServerApp.password=''",
                 f"--ServerApp.base_url=/notebook/{self.project_name}/{self.notebook_id}",
                 "--ServerApp.quit_button=False",
-                f'--ServerApp.tornado_settings={{"user":"{self.translated_username}","hub_host":"{self.origin}","hub_prefix":"/projects/{self.project_name}"}}',
             ]
         )
         return expected_args

jupyter/datascience/ubi9-python-3.12/kustomize/base/statefulset.yaml

@@ -28,7 +28,6 @@ spec:
                 --ServerApp.password=''
                 --ServerApp.base_url=/notebook/opendatahub/jovyan
                 --ServerApp.quit_button=False
-                --ServerApp.tornado_settings={"user":"jovyan","hub_host":"https://opendatahub.io","hub_prefix":"/notebookController/jovyan"}
           ports:
             - name: notebook-port
               protocol: TCP

jupyter/minimal/ubi9-python-3.12/kustomize/base/statefulset.yaml

@@ -28,7 +28,6 @@ spec:
                 --ServerApp.password=''
                 --ServerApp.base_url=/notebook/opendatahub/jovyan
                 --ServerApp.quit_button=False
-                --ServerApp.tornado_settings={"user":"jovyan","hub_host":"https://opendatahub.io","hub_prefix":"/notebookController/jovyan"}
           ports:
             - name: notebook-port
               protocol: TCP

jupyter/pytorch+llmcompressor/ubi9-python-3.12/kustomize/base/statefulset.yaml

@@ -28,7 +28,6 @@ spec:
                 --ServerApp.password=''
                 --ServerApp.base_url=/notebook/opendatahub/jovyan
                 --ServerApp.quit_button=False
-                --ServerApp.tornado_settings={"user":"jovyan","hub_host":"https://opendatahub.io","hub_prefix":"/notebookController/jovyan"}
           ports:
             - name: notebook-port
               protocol: TCP

jupyter/pytorch/ubi9-python-3.12/kustomize/base/statefulset.yaml

@@ -28,7 +28,6 @@ spec:
                 --ServerApp.password=''
                 --ServerApp.base_url=/notebook/opendatahub/jovyan
                 --ServerApp.quit_button=False
-                --ServerApp.tornado_settings={"user":"jovyan","hub_host":"https://opendatahub.io","hub_prefix":"/notebookController/jovyan"}
           ports:
             - name: notebook-port
               protocol: TCP

jupyter/rocm/pytorch/ubi9-python-3.12/kustomize/base/statefulset.yaml

@@ -28,7 +28,6 @@ spec:
                 --ServerApp.password=''
                 --ServerApp.base_url=/notebook/opendatahub/jovyan
                 --ServerApp.quit_button=False
-                --ServerApp.tornado_settings={"user":"jovyan","hub_host":"https://opendatahub.io","hub_prefix":"/notebookController/jovyan"}
           ports:
             - name: notebook-port
               protocol: TCP

jupyter/rocm/tensorflow/ubi9-python-3.12/kustomize/base/statefulset.yaml

@@ -28,7 +28,6 @@ spec:
                 --ServerApp.password=''
                 --ServerApp.base_url=/notebook/opendatahub/jovyan
                 --ServerApp.quit_button=False
-                --ServerApp.tornado_settings={"user":"jovyan","hub_host":"https://opendatahub.io","hub_prefix":"/notebookController/jovyan"}
           ports:
             - name: notebook-port
               protocol: TCP

jupyter/tensorflow/ubi9-python-3.12/kustomize/base/statefulset.yaml

@@ -28,7 +28,6 @@ spec:
                 --ServerApp.password=''
                 --ServerApp.base_url=/notebook/opendatahub/jovyan
                 --ServerApp.quit_button=False
-                --ServerApp.tornado_settings={"user":"jovyan","hub_host":"https://opendatahub.io","hub_prefix":"/notebookController/jovyan"}
           ports:
             - name: notebook-port
               protocol: TCP

jupyter/trustyai/ubi9-python-3.12/kustomize/base/statefulset.yaml

@@ -28,7 +28,6 @@ spec:
                 --ServerApp.password=''
                 --ServerApp.base_url=/notebook/opendatahub/jovyan
                 --ServerApp.quit_button=False
-                --ServerApp.tornado_settings={"user":"jovyan","hub_host":"https://opendatahub.io","hub_prefix":"/notebookController/jovyan"}
           ports:
             - name: notebook-port
               protocol: TCP

runtimes/datascience/ubi9-python-3.12/Dockerfile.cpu

@@ -369,6 +369,9 @@ RUN --mount=type=cache,target=/root/.cache/pip \
         #  we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
         uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml; \
     fi && \
+    # change ownership to default user (all packages were installed as root and has root:root ownership
+    chown -R 1001:0 /opt/app-root/ && \
+    chmod -R g=u /opt/app-root && \
     # Fix permissions to support pip in Openshift environments
     chmod -R g+w /opt/app-root/lib/python3.12/site-packages && \
     fix-permissions /opt/app-root -P