From 8eec240513f780c70dd815b81d769fe73b830eaa Mon Sep 17 00:00:00 2001 From: Andrew Scribner Date: Thu, 16 Nov 2023 13:42:57 -0500 Subject: [PATCH 1/2] update notebook server images to final v1.8.0 release Removes the `-rc*` from all notebook images, pointing instead to the final releases. Also fixes a bug where, previously, the vscode and rstudio images were reversed in config.yaml (the vscode-images entry had an rstudio image, and vise versa). This may have been because the config.yaml images are in a different order than the upstream spawner_ui_config.yaml that we sync to - to avoid this in future, the config.yaml ordering was changed. --- .../examples/sample-notebook.yaml | 2 +- charms/jupyter-ui/config.yaml | 25 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/charms/jupyter-controller/examples/sample-notebook.yaml b/charms/jupyter-controller/examples/sample-notebook.yaml index 376a124d..dc42a02c 100644 --- a/charms/jupyter-controller/examples/sample-notebook.yaml +++ b/charms/jupyter-controller/examples/sample-notebook.yaml @@ -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: diff --git a/charms/jupyter-ui/config.yaml b/charms/jupyter-ui/config.yaml index fb6eca3c..dbaf2e9e 100644 --- a/charms/jupyter-ui/config.yaml +++ b/charms/jupyter-ui/config.yaml @@ -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 order o) 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 From 6dbea81bf411f887d55d9d205c2589dba18a34e3 Mon Sep 17 00:00:00 2001 From: Andrew Scribner Date: Thu, 16 Nov 2023 14:06:39 -0500 Subject: [PATCH 2/2] update workload images to final v1.8.0 release Removes the `-rc*` from, pointing instead to the final v1.8.0 releases. --- charms/jupyter-controller/metadata.yaml | 2 +- charms/jupyter-ui/metadata.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charms/jupyter-controller/metadata.yaml b/charms/jupyter-controller/metadata.yaml index b7baf4ad..a9608f64 100644 --- a/charms/jupyter-controller/metadata.yaml +++ b/charms/jupyter-controller/metadata.yaml @@ -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 diff --git a/charms/jupyter-ui/metadata.yaml b/charms/jupyter-ui/metadata.yaml index fc4587c5..44faec48 100644 --- a/charms/jupyter-ui/metadata.yaml +++ b/charms/jupyter-ui/metadata.yaml @@ -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