fix: Explicitly set KATIB_DB_MANAGER_SERVICE_PORT (#192)

* fix: Explicitly set `KATIB_DB_MANAGER_SERVICE_PORT` in katib-controller * katib-db-manager: Remove port config option Closes canonical/bundle-kubeflow#893, #108 Addressed also part of #184
canonical · Jun 13, 2024 · f401c7a · f401c7a
1 parent 7ff9e1b
commit f401c7a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/charms/katib-controller/src/charm.py b/charms/katib-controller/src/charm.py
@@ -253,7 +253,13 @@ def set_pod_spec(self, event):
                                 "containerPort": self.model.config["metrics-port"],
                             },
                         ],
-                        "envConfig": {"KATIB_CORE_NAMESPACE": self.model.name},
+                        "envConfig": {
+                            "KATIB_CORE_NAMESPACE": self.model.name,
+                            # We hardcode the envvar's value due to
+                            # https://github.com/canonical/katib-operators/issues/108
+                            # Its value comes from `SERVICE_PORT` constant of katib-db-manager charm
+                            "KATIB_DB_MANAGER_SERVICE_PORT": "6789",
+                        },
                         "volumeConfig": [
                             {
                                 "name": "certs",

diff --git a/charms/katib-db-manager/config.yaml b/charms/katib-db-manager/config.yaml
diff --git a/charms/katib-db-manager/src/charm.py b/charms/katib-db-manager/src/charm.py
@@ -23,6 +23,9 @@
 ]
 MYSQL_WARNING = "Relation mysql is deprecated."
 UNBLOCK_MESSAGE = "Remove deprecated mysql relation to unblock."
+# Value is hardcoded in upstream
+# https://github.com/kubeflow/katib/blob/release-0.16/cmd/db-manager/v1beta1/main.go#L38
+SERVICE_PORT = "6789"
 
 
 class KatibDBManagerOperator(CharmBase):
@@ -37,7 +40,6 @@ def __init__(self, framework):
         self._database_name = "katib"
         self._container = self.unit.get_container(self._container_name)
         self._exec_command = "./katib-db-manager"
-        self._port = self.model.config["port"]
         self._lightkube_field_manager = "lightkube"
         self._namespace = self.model.name
         self._name = self.model.app.name
@@ -76,7 +78,7 @@ def __init__(self, framework):
         self.framework.observe(self.database.on.database_created, self._on_relational_db_relation)
         self.framework.observe(self.database.on.endpoints_changed, self._on_relational_db_relation)
 
-        port = ServicePort(int(self._port), name="api")
+        port = ServicePort(int(SERVICE_PORT), name="api")
         self.service_patcher = KubernetesServicePatch(
             self,
             [port],