Expose Minio Console and API via Ingress

metadata.yaml

@@ -24,3 +24,8 @@ storage:
     type: filesystem
     location: /data
     minimum-size: 10G
+requires:
+  ingress:
+    interface: ingress
+    schema: https://raw.githubusercontent.com/canonical/operator-schemas/master/ingress.yaml
+    versions: [v1]

src/charm.py

@@ -56,6 +56,8 @@ def main(self, event):
         secret_key = self.model.config["secret-key"] or self._stored.secret_key
         self._send_info(interfaces, secret_key)
 
+        self._configure_ingress(interfaces)
+
         self.model.unit.status = MaintenanceStatus("Setting pod spec")
         self.model.pod.set_spec(
             {
@@ -169,6 +171,25 @@ def _with_console_address(self, minio_args):
         console_port = str(self.model.config["console-port"])
         return [*minio_args, "--console-address", ":" + console_port]
 
+    def _configure_ingress(self, interfaces):
+        if interfaces["ingress"]:
+            interfaces["ingress"].send_data(
+                {
+                    "prefix": "/",
+                    "rewrite": "/",
+                    "service": f"{self.model.app.name}-console",
+                    "port": self.model.config["console-port"],
+                }
+            )
+            interfaces["ingress"].send_data(
+                {
+                    "prefix": "/",
+                    "rewrite": "/",
+                    "service": f"{self.model.app.name}",
+                    "port": self.model.config["port"],
+                }
+            )
+
 
 def _gen_pass() -> str:
     return "".join(choices(ascii_uppercase + digits, k=30))

tests/unit/test_charm.py

@@ -309,3 +309,65 @@ def test_minio_console_port_args(harness):
         "--console-address",
         ":9999",
     ]
+
+def test_install_with_all_inputs(harness):
+    harness.set_leader(True)
+    harness.add_oci_resource(
+        "oci-image",
+        {
+            "registrypath": "ci-test",
+            "username": "",
+            "password": "",
+        },
+    )
+    harness.update_config(
+        {
+            "secret-key": "test-secret-key",
+            "access-key": "test-access-key",
+            "mode": "gateway",
+            "gateway-storage-service": "azure",
+        }
+    )
+
+    # object storage
+    os_rel_id = harness.add_relation("object-storage", "foobar")
+    harness.add_relation_unit(os_rel_id, "foobar/0")
+    harness.update_relation_data(
+        os_rel_id,
+        "foobar",
+        {"_supported_versions": yaml.dump(["v1"])},
+    )
+
+    # ingress
+    ingress_relation_name = "ingress"
+    relation_version_data = {"_supported_versions": "- v1"}
+    ingress_rel_id = harness.add_relation(
+        ingress_relation_name, f"{ingress_relation_name}-subscriber"
+    )
+    harness.add_relation_unit(ingress_rel_id, f"{ingress_relation_name}-subscriber/0")
+    harness.update_relation_data(
+        ingress_rel_id, f"{ingress_relation_name}-subscriber", relation_version_data
+    )
+
+    harness.begin_with_initial_hooks()
+
+    pod_spec = harness.get_pod_spec()
+    yaml.safe_dump(pod_spec)
+    assert harness.charm.model.unit.status == ActiveStatus()
+
+    charm_name = harness.model.app.name
+    secrets = pod_spec[0]["kubernetesResources"]["secrets"]
+    env_config = pod_spec[0]["containers"][0]["envConfig"]
+
+    pod_spec_secrets = pod_spec[0]["kubernetesResources"]["secrets"]
+    pod_spec_secret_key = pod_spec_secrets[0]["data"]["MINIO_SECRET_KEY"]
+    pod_spec_access_key = pod_spec_secrets[0]["data"]["MINIO_ACCESS_KEY"]
+
+    assert b64decode(pod_spec_secret_key).decode("utf-8") == "test-secret-key"
+    assert b64decode(pod_spec_access_key).decode("utf-8") == "test-access-key"
+    assert pod_spec[0]["containers"][0]["args"] == [
+        "gateway",
+        "azure",
+        "--console-address",
+        ":9001",
+    ]