Merge pull request #417 from eigr/feat/add-monitor-app

fix: system cluster connection
eigr · Jan 17, 2025 · 4d167e9 · 4d167e9
2 parents 7d03f44 + 1864ccf
commit 4d167e9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/lib/spawn/cluster/cluster_supervisor.ex b/lib/spawn/cluster/cluster_supervisor.ex
@@ -97,7 +97,7 @@ defmodule Spawn.Cluster.ClusterSupervisor do
         strategy: Elixir.Cluster.Strategy.Kubernetes.DNS,
         config: [
           service: Config.get(:proxy_headless_service),
-          application_name: Config.get(:app_name),
+          application_name: Config.get(:actor_system_name),
           polling_interval: Config.get(:proxy_cluster_polling_interval)
         ]
       ]

diff --git a/spawn_monitor/lib/spawn_monitor/cluster.ex b/spawn_monitor/lib/spawn_monitor/cluster.ex
@@ -72,7 +72,7 @@ defmodule SpawnMonitor.Cluster do
         strategy: Cluster.Strategy.Kubernetes.DNS,
         config: [
           service: env("PROXY_HEADLESS_SERVICE", "proxy-headless"),
-          application_name: env("PROXY_APP_NAME", "proxy"),
+          application_name: env("PROXY_ACTOR_SYSTEM_NAME", "proxy"),
           polling_interval: polling_interval
         ]
       ]

diff --git a/spawn_operator/spawn_operator/lib/spawn_operator/k8s/proxy/deployment.ex b/spawn_operator/spawn_operator/lib/spawn_operator/k8s/proxy/deployment.ex
@@ -6,10 +6,6 @@ defmodule SpawnOperator.K8s.Proxy.Deployment do
   @behaviour SpawnOperator.K8s.Manifest
 
   @default_actor_host_function_env [
-    %{
-      "name" => "RELEASE_NAME",
-      "value" => "proxy"
-    },
     %{
       "name" => "NAMESPACE",
       "valueFrom" => %{"fieldRef" => %{"fieldPath" => "metadata.namespace"}}
@@ -282,6 +278,10 @@ defmodule SpawnOperator.K8s.Proxy.Deployment do
     updated_default_envs =
       @default_actor_host_function_env ++
         [
+          %{
+            "name" => "RELEASE_NAME",
+            "value" => system
+          },
           %{
             "name" => "RELEASE_COOKIE",
             "valueFrom" => %{
@@ -358,6 +358,10 @@ defmodule SpawnOperator.K8s.Proxy.Deployment do
     updated_default_envs =
       @default_actor_host_function_env ++
         [
+          %{
+            "name" => "RELEASE_NAME",
+            "value" => system
+          },
           %{
             "name" => "RELEASE_COOKIE",
             "valueFrom" => %{