Skip to content

Commit

Permalink
Update image and manifests for v1.8 (#315)
Browse files Browse the repository at this point in the history
* Update image and manifests for v1.8
* Update spawner_ui_config.yaml.j2 gpu section

updated to match [upstream manifests for 1.8](https://github.com/kubeflow/manifests/blob/v1.8.0/apps/jupyter/jupyter-web-app/upstream/base/configs/spawner_ui_config.yaml#L132-L136)

* fix typo in config.yaml defaults

RStudio and VSCode images were swapped by mistake, likely due to a transcription error with upstream.  The order of these options in config.yaml has been changed to match upstream and hopefully prevent this in future.

---------

Co-authored-by: Andrew Scribner <[email protected]>
  • Loading branch information
misohu and ca-scribner authored Nov 17, 2023
1 parent e188acb commit c93daa3
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion charms/jupyter-controller/examples/sample-notebook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
spec:
containers:
- name: notebook
image: kubeflownotebookswg/jupyter-pytorch-full:v1.8.0-rc.0
image: kubeflownotebookswg/jupyter-pytorch-full:v1.8.0
imagePullPolicy: IfNotPresent
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion charms/jupyter-controller/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ resources:
type: oci-image
description: 'Backing OCI image'
auto-fetch: true
upstream-source: docker.io/kubeflownotebookswg/notebook-controller:v1.8.0-rc.0
upstream-source: docker.io/kubeflownotebookswg/notebook-controller:v1.8.0
provides:
metrics-endpoint:
interface: prometheus_scrape
Expand Down
25 changes: 14 additions & 11 deletions charms/jupyter-ui/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,25 @@ options:
type: boolean
default: false
description: Whether cookies should require HTTPS
# Note: *-images options here are intentionally not in alphabetical order
# in order to match the same order as in the spawner_ui_config.yaml
# (typos have been made in past when the orders did not match)
jupyter-images:
type: string
default: |
- kubeflownotebookswg/jupyter-scipy:v1.8.0-rc.0
- kubeflownotebookswg/jupyter-pytorch-full:v1.8.0-rc.0
- kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.8.0-rc.0
- kubeflownotebookswg/jupyter-tensorflow-full:v1.8.0-rc.0
- kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.8.0-rc.0
- kubeflownotebookswg/jupyter-scipy:v1.8.0
- kubeflownotebookswg/jupyter-pytorch-full:v1.8.0
- kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.8.0
- kubeflownotebookswg/jupyter-tensorflow-full:v1.8.0
- kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.8.0
description: list of image options for Jupyter Notebook
rstudio-images:
type: string
default: |
- kubeflownotebookswg/codeserver-python:v1.8.0-rc.0
description: list of image options for RStudio
vscode-images:
type: string
default: |
- kubeflownotebookswg/rstudio-tidyverse:v1.8.0-rc.0
- kubeflownotebookswg/codeserver-python:v1.8.0
description: list of image options for VSCode
rstudio-images:
type: string
default: |
- kubeflownotebookswg/rstudio-tidyverse:v1.8.0
description: list of image options for RStudio
2 changes: 1 addition & 1 deletion charms/jupyter-ui/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ resources:
oci-image:
type: oci-image
description: 'Backing OCI image'
upstream-source: docker.io/kubeflownotebookswg/jupyter-web-app:v1.8.0-rc.0
upstream-source: docker.io/kubeflownotebookswg/jupyter-web-app:v1.8.0
requires:
ingress:
interface: ingress
Expand Down
11 changes: 5 additions & 6 deletions charms/jupyter-ui/src/spawner_ui_config.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,11 @@ spawnerFormDefaults:
# the list of available vendors in the dropdown
# `limitsKey` - what will be set as the actual limit
# `uiName` - what will be displayed in the dropdown UI
vendors: []
#vendors:
# - limitsKey: "nvidia.com/gpu"
# uiName: "NVIDIA"
# - limitsKey: "amd.com/gpu"
# uiName: "AMD"
vendors:
- limitsKey: "nvidia.com/gpu"
uiName: "NVIDIA"
- limitsKey: "amd.com/gpu"
uiName: "AMD"

# the default value of the limit
# (possible values: "none", "1", "2", "4", "8")
Expand Down

0 comments on commit c93daa3

Please sign in to comment.