Merge branch 'track/1.7' of github.com:canonical/notebook-operators i…

…nto track/1.7
canonical · Jul 15, 2023 · 2dbbe2b · 2dbbe2b
2 parents 5417821 + 4102e9f
commit 2dbbe2b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/charms/jupyter-controller/metadata.yaml b/charms/jupyter-controller/metadata.yaml
@@ -7,7 +7,7 @@ resources:
   oci-image:
     type: oci-image
     description: 'Backing OCI image'
-    upstream-source: docker.io/kubeflownotebookswg/notebook-controller:v1.7.0-rc.1
+    upstream-source: docker.io/kubeflownotebookswg/notebook-controller:v1.7.0
 deployment:
   type: stateless
   service: omit

diff --git a/charms/jupyter-ui/metadata.yaml b/charms/jupyter-ui/metadata.yaml
@@ -8,7 +8,7 @@ resources:
   oci-image:
     type: oci-image
     description: 'Backing OCI image'
-    upstream-source: docker.io/kubeflownotebookswg/jupyter-web-app:v1.7.0-rc.1
+    upstream-source: docker.io/kubeflownotebookswg/jupyter-web-app:v1.7.0
 requires:
   ingress:
     interface: ingress

diff --git a/charms/jupyter-ui/src/spawner_ui_config.yaml b/charms/jupyter-ui/src/spawner_ui_config.yaml
@@ -18,24 +18,24 @@
 spawnerFormDefaults:
   image:
     # The container Image for the user's Jupyter Notebook
-    value: kubeflownotebookswg/jupyter-scipy:v1.7.0-rc.1
+    value: kubeflownotebookswg/jupyter-scipy:v1.7.0
     # The list of available standard container Images
     options:
-    - kubeflownotebookswg/jupyter-scipy:v1.7.0-rc.1
-    - kubeflownotebookswg/jupyter-pytorch-full:v1.7.0-rc.1
-    - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.7.0-rc.1
-    - kubeflownotebookswg/jupyter-tensorflow-full:v1.7.0-rc.1
-    - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.7.0-rc.1
+    - kubeflownotebookswg/jupyter-scipy:v1.7.0
+    - kubeflownotebookswg/jupyter-pytorch-full:v1.7.0
+    - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.7.0
+    - kubeflownotebookswg/jupyter-tensorflow-full:v1.7.0
+    - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.7.0
     - swr.cn-south-1.myhuaweicloud.com/mindspore/jupyter-mindspore:v1.6.1
   imageGroupOne:
     # The container Image for the user's Group One Server
     # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
     # is applied to notebook in this group, configuring
     # the Istio rewrite for containers that host their web UI at `/`
-    value: kubeflownotebookswg/codeserver-python:v1.7.0-rc.1
+    value: kubeflownotebookswg/codeserver-python:v1.7.0
     # The list of available standard container Images
     options:
-    - kubeflownotebookswg/codeserver-python:v1.7.0-rc.1
+    - kubeflownotebookswg/codeserver-python:v1.7.0
   imageGroupTwo:
     # The container Image for the user's Group Two Server
     # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
@@ -44,10 +44,10 @@ spawnerFormDefaults:
     # The annotation `notebooks.kubeflow.org/http-headers-request-set`
     # is applied to notebook in this group, configuring Istio
     # to add the `X-RStudio-Root-Path` header to requests
-    value: kubeflownotebookswg/rstudio-tidyverse:v1.7.0-rc.1
+    value: kubeflownotebookswg/rstudio-tidyverse:v1.7.0
     # The list of available standard container Images
     options:
-    - kubeflownotebookswg/rstudio-tidyverse:v1.7.0-rc.1
+    - kubeflownotebookswg/rstudio-tidyverse:v1.7.0
   # If true, hide registry and/or tag name in the image selection dropdown
   hideRegistry: true
   hideTag: false