fix(deployment): Restore CLP_*_HOST env vars for bundled services to allow configurable port bindings (fixes #2055). (#2056)

Author: junhaoliao

components/clp-package-utils/clp_package_utils/controller.py

@@ -191,6 +191,9 @@ def _set_up_env_for_database(self) -> EnvVarsDict:
         env_vars |= {
             "CLP_DB_NAME": self._clp_config.database.names[ClpDbNameType.CLP],
         }
+        if self._clp_config.compression_scheduler.type == OrchestrationType.SPIDER:
+            env_vars["SPIDER_DB_NAME"] = self._clp_config.database.names[ClpDbNameType.SPIDER]
+
         if BundledService.DATABASE not in self._clp_config.bundled:
             env_vars |= {
                 "CLP_DB_PORT": str(self._clp_config.database.port),
@@ -199,9 +202,8 @@ def _set_up_env_for_database(self) -> EnvVarsDict:
                     self._clp_config.database.host
                 ),
             }
-
-        if self._clp_config.compression_scheduler.type == OrchestrationType.SPIDER:
-            env_vars["SPIDER_DB_NAME"] = self._clp_config.database.names[ClpDbNameType.SPIDER]
+        else:
+            env_vars["CLP_DB_HOST"] = _get_ip_from_hostname(self._clp_config.database.host)
 
         # Credentials
         credentials = self._clp_config.database.credentials
@@ -275,6 +277,8 @@ def _set_up_env_for_queue(self) -> EnvVarsDict:
                 "CLP_EXTRA_HOST_QUEUE_NAME": QUEUE_COMPONENT_NAME,
                 "CLP_EXTRA_HOST_QUEUE_ADDR": _resolve_external_host(self._clp_config.queue.host),
             }
+        else:
+            env_vars["CLP_QUEUE_HOST"] = _get_ip_from_hostname(self._clp_config.queue.host)
 
         # Credentials
         env_vars |= {
@@ -359,6 +363,8 @@ def _set_up_env_for_redis(self) -> EnvVarsDict:
                 "CLP_EXTRA_HOST_REDIS_NAME": REDIS_COMPONENT_NAME,
                 "CLP_EXTRA_HOST_REDIS_ADDR": _resolve_external_host(self._clp_config.redis.host),
             }
+        else:
+            env_vars["CLP_REDIS_HOST"] = _get_ip_from_hostname(self._clp_config.redis.host)
 
         # Credentials
         env_vars |= {
@@ -463,6 +469,10 @@ def _set_up_env_for_results_cache(self) -> EnvVarsDict:
                     self._clp_config.results_cache.host
                 ),
             }
+        else:
+            env_vars["CLP_RESULTS_CACHE_HOST"] = _get_ip_from_hostname(
+                self._clp_config.results_cache.host
+            )
 
         return env_vars