Merge pull request #139 from canonical/kf-6155-integrate-rocks-main

forward-port(chore): integrate rocks for 1.9.0 from #137
canonical · Sep 9, 2024 · 12473cb · 12473cb
2 parents 3b3b7ff + 31d5d5a
commit 12473cb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charms/tensorboard-controller/metadata.yaml b/charms/tensorboard-controller/metadata.yaml
@@ -14,7 +14,7 @@ resources:
   tensorboard-controller-image:
     type: oci-image
     description: OCI image for Tensorboard Controller
-    upstream-source: kubeflownotebookswg/tensorboard-controller:v1.9.0-rc.0
+    upstream-source: charmedkubeflow/tensorboard-controller:1.9.0-d74bfd2
 requires:
   gateway-info:
     interface: istio-gateway-info

diff --git a/charms/tensorboards-web-app/metadata.yaml b/charms/tensorboards-web-app/metadata.yaml
@@ -14,7 +14,7 @@ resources:
     type: oci-image
     description: OCI image for Tensorboards Web App
     auto-fetch: true
-    upstream-source: kubeflownotebookswg/tensorboards-web-app:v1.9.0-rc.0
+    upstream-source: charmedkubeflow/tensorboards-web-app:1.9.0-4b44bb5
 requires:
   ingress:
     interface: ingress

diff --git a/charms/tensorboards-web-app/src/charm.py b/charms/tensorboards-web-app/src/charm.py
@@ -149,7 +149,7 @@ def _tensorboards_web_app_layer(self) -> Layer:
             "description": "Pebble config layer for tensorboards-web-app",
             "services": {
                 self._container_name: {
-                    "override": "replace",
+                    "override": "merge",
                     "summary": "Entrypoint of tensorboards-web-app image",
                     "command": exec_command,
                     "startup": "enabled",