Switch to sdi

operators/katib-controller/requirements.txt

@@ -1,2 +1,2 @@
-ops==1.0.1
-git+git://github.com/juju-solutions/resource-oci-image.git#egg=oci_image
+ops==1.2.0
+oci-image==1.0.0

operators/katib-db-manager/requirements.txt

@@ -1,2 +1,2 @@
-ops==1.0.1
-git+git://github.com/juju-solutions/resource-oci-image.git#egg=oci_image
+ops==1.2.0
+oci-image==1.0.0

operators/katib-ui/metadata.yaml

@@ -19,8 +19,10 @@ resources:
     auto-fetch: true
     upstream-source: docker.io/kubeflowkatib/katib-ui:v1beta1-a96ff59
 requires:
-  service-mesh:
-    interface: service-mesh
+  ingress:
+    interface: ingress
+    schema: https://raw.githubusercontent.com/canonical/operator-schemas/master/ingress.yaml
+    versions: [v1]
 provides:
   katib-ui:
     interface: http

operators/katib-ui/requirements.txt

@@ -1,2 +1,3 @@
-ops==1.0.1
-git+git://github.com/juju-solutions/resource-oci-image.git#egg=oci_image
+ops==1.2.0
+oci-image==1.0.0
+serialized-data-interface==0.2.2

operators/katib-ui/src/charm.py

@@ -2,11 +2,15 @@
 
 import logging
 
+from oci_image import OCIImageResource, OCIImageResourceError
 from ops.charm import CharmBase
 from ops.main import main
-from ops.model import ActiveStatus, MaintenanceStatus
-
-from oci_image import OCIImageResource, OCIImageResourceError
+from ops.model import ActiveStatus, BlockedStatus, MaintenanceStatus, WaitingStatus
+from serialized_data_interface import (
+    NoCompatibleVersions,
+    NoVersionsListed,
+    get_interfaces,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -22,9 +26,34 @@ def __init__(self, framework):
             self.model.unit.status = ActiveStatus()
             return
 
+        try:
+            self.interfaces = get_interfaces(self)
+        except NoVersionsListed as err:
+            self.model.unit.status = WaitingStatus(str(err))
+            return
+        except NoCompatibleVersions as err:
+            self.model.unit.status = BlockedStatus(str(err))
+            return
+        else:
+            self.model.unit.status = ActiveStatus()
+
         self.image = OCIImageResource(self, "oci-image")
         self.framework.observe(self.on.install, self.set_pod_spec)
         self.framework.observe(self.on.upgrade_charm, self.set_pod_spec)
+        self.framework.observe(
+            self.on["ingress"].relation_changed,
+            self.configure_ingress,
+        )
+
+    def configure_ingress(self, event):
+        if self.interfaces["ingress"]:
+            self.interfaces["ingress"].send_data(
+                {
+                    "prefix": "/katib/",
+                    "service": self.model.app.name,
+                    "port": self.model.config["port"],
+                }
+            )
 
     def set_pod_spec(self, event):
         self.model.unit.status = MaintenanceStatus("Setting pod spec")