diff --git a/README.md b/README.md index 92b9a7f8a..4447a6784 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Contains a fully reproducible configuration for JupyterHub on datahub.berkeley.edu, as well as the single user images. -[UC Berkeley Datahub](https://cdss.berkeley.edu/data) +[UC Berkeley Datahub](https://cdss.berkeley.edu/datahub) [UC Berkeley CDSS](https://cdss.berkeley.edu) diff --git a/deployments/a11y/config/common.yaml b/deployments/a11y/config/common.yaml index 21a74c2d1..63443c560 100644 --- a/deployments/a11y/config/common.yaml +++ b/deployments/a11y/config/common.yaml @@ -67,9 +67,27 @@ jupyterhub: c.QtPDFExporter.enabled = False c.QtPNGExporter.enabled = False c.WebPDFExporter.enabled = False + # proxy ollama + proxy-ollama: + # https://jupyter-server-proxy.readthedocs.io/en/latest/server-process.html#specifying-config-via-traitlets + mountPath: /etc/jupyter/jupyter_server_config.py + stringData: | + c.ServerProxy.servers = { + "ollama": { + "command": ["ollama", "serve"], + "port": 11434, + # This is not a user-facing web application + "launcher_entry": { + "enabled": False + } + } + } extraEnv: # Unset NotebookApp from hub/values. Necessary for recent lab versions. JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp" + OLLAMA_ORIGINS: "*" + OLLAMA_HOST: "0.0.0.0:11434" + OLLAMA_DEBUG: "1" nodeSelector: hub.jupyter.org/pool-name: small-courses-pool storage: @@ -83,5 +101,5 @@ jupyterhub: subPath: _shared readOnly: true memory: - guarantee: 3G - limit: 3G + guarantee: 5G + limit: 5G diff --git a/deployments/a11y/hubploy.yaml b/deployments/a11y/hubploy.yaml index 37d7fe8fc..8f5a91da2 100644 --- a/deployments/a11y/hubploy.yaml +++ b/deployments/a11y/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:6515cad7fcf5 + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:56488626d322 cluster: provider: gcloud diff --git a/deployments/data101/hubploy.yaml b/deployments/data101/hubploy.yaml index 20e7bdd70..eb51bfd38 100644 --- a/deployments/data101/hubploy.yaml +++ b/deployments/data101/hubploy.yaml @@ -1,6 +1,6 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data101-user-image:48a90d76171a + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data101-user-image:ba209883023b cluster: provider: gcloud diff --git a/deployments/gradebook/config/common.yaml b/deployments/gradebook/config/common.yaml index 1606d43f5..df50ff65e 100644 --- a/deployments/gradebook/config/common.yaml +++ b/deployments/gradebook/config/common.yaml @@ -52,7 +52,7 @@ jupyterhub: # https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.extra_containers extraContainers: - name: gradebook - image: gradebook/gradebook:sha-721f235 + image: gradebook/gradebook:sha-a9a7895 ports: - containerPort: 3839 volumeMounts: