feat: #83 allow a node to join an existing cluster

ptah-sh · Jul 30, 2024 · 373e15d · 373e15d
1 parent 012785c
commit 373e15d
Show file tree

Hide file tree

Showing 25 changed files with 380 additions and 32 deletions.
diff --git a/api-nodes/Http/Controllers/EventController.php b/api-nodes/Http/Controllers/EventController.php
@@ -2,17 +2,30 @@
 
 namespace ApiNodes\Http\Controllers;
 
+use ApiNodes\Models\AgentStartedEventData;
 use App\Models\Node;
 use App\Models\NodeData;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class EventController
 {
-    public function started(Node $node, NodeData $data)
+    public function started(Node $node, AgentStartedEventData $data)
     {
-        $node->data = $data;
+        DB::transaction(function () use ($node, $data) {
+            $node->data = $data->node;
+            $node->save();
 
-        $node->save();
+            if ($node->swarm && $data->swarm) {
+                $swarm = $node->swarm;
+
+                $swarm->data->joinTokens = $data->swarm->joinTokens;
+                $swarm->data->managerNodes = $data->swarm->managerNodes;
+
+                $swarm->save();
+            }
+        });
 
         return [
             'settings' => [

diff --git a/api-nodes/Models/AgentStartedEventData.php b/api-nodes/Models/AgentStartedEventData.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace ApiNodes\Models;
+
+use ApiNodes\Models\AgentStartedEventData\SwarmData;
+use App\Models\NodeData;
+use Spatie\LaravelData\Data;
+
+class AgentStartedEventData extends Data
+{
+    public function __construct(
+        public NodeData $node,
+        public ?SwarmData $swarm,
+    )
+    {
+
+    }
+}
diff --git a/api-nodes/Models/AgentStartedEventData/SwarmData.php b/api-nodes/Models/AgentStartedEventData/SwarmData.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace ApiNodes\Models\AgentStartedEventData;
+
+use App\Models\SwarmData\JoinTokens;
+use App\Models\SwarmData\ManagerNode;
+use Spatie\LaravelData\Attributes\DataCollectionOf;
+use Spatie\LaravelData\Data;
+
+class SwarmData extends Data
+{
+    public function __construct(
+        public JoinTokens $joinTokens,
+        #[DataCollectionOf(ManagerNode::class)]
+        /* @var ManagerNode[] */
+        public array $managerNodes,
+    )
+    {
+
+    }
+}
diff --git a/app/Events/NodeTasks/JoinSwarm/JoinSwarmCompleted.php b/app/Events/NodeTasks/JoinSwarm/JoinSwarmCompleted.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Events\NodeTasks\JoinSwarm;
+
+use App\Events\NodeTasks\BaseTaskEvent;
+
+class JoinSwarmCompleted extends BaseTaskEvent
+{
+}
diff --git a/app/Events/NodeTasks/JoinSwarm/JoinSwarmFailed.php b/app/Events/NodeTasks/JoinSwarm/JoinSwarmFailed.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Events\NodeTasks\JoinSwarm;
+
+use App\Events\NodeTasks\BaseTaskEvent;
+
+class JoinSwarmFailed extends BaseTaskEvent
+{
+}
diff --git a/app/Http/Controllers/NodeController.php b/app/Http/Controllers/NodeController.php
@@ -8,6 +8,7 @@
 use App\Models\Node;
 use App\Models\NodeTaskGroupType;
 use App\Models\Service;
+use App\Models\Swarm;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Inertia\Inertia;
@@ -54,6 +55,11 @@ public function show(Node $node)
             $initTaskGroup = null;
         }
 
+        $joinTaskGroup = $node->actualTaskGroup(NodeTaskGroupType::JoinSwarm);
+        if ($joinTaskGroup?->is_completed) {
+            $joinTaskGroup = null;
+        }
+
         $lastAgentVersion = AgentRelease::latest()->first()?->tag_name;
 
         $taskGroup = $node->actualTaskGroup(NodeTaskGroupType::SelfUpgrade);
@@ -67,8 +73,9 @@ public function show(Node $node)
 
         return Inertia::render('Nodes/Show', [
             'node' => $node,
+            'swarms' => Swarm::all(),
             'isLastNode' => $node->team->nodes->count() === 1,
-            'initTaskGroup' => $initTaskGroup,
+            'initTaskGroup' => $initTaskGroup ?: $joinTaskGroup,
             'lastAgentVersion' => $lastAgentVersion,
             'agentUpgradeTaskGroup' => $taskGroup?->is_completed ? null : $taskGroup,
             'registryUpdateTaskGroup' => $registryTaskGroup?->is_completed ? null : $registryTaskGroup

diff --git a/app/Http/Controllers/SwarmTaskController.php b/app/Http/Controllers/SwarmTaskController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\NodeTask\InitClusterFormRequest;
+use App\Http\Requests\NodeTask\JoinClusterFormRequest;
 use App\Models\Deployment;
 use App\Models\DeploymentData;
 use App\Models\DeploymentData\LaunchMode;
@@ -13,6 +14,7 @@
 use App\Models\NodeTaskGroupType;
 use App\Models\NodeTasks\CreateNetwork\CreateNetworkMeta;
 use App\Models\NodeTasks\InitSwarm\InitSwarmMeta;
+use App\Models\NodeTasks\JoinSwarm\JoinSwarmMeta;
 use App\Models\NodeTasks\UpdateCurrentNode\UpdateCurrentNodeMeta;
 use App\Models\NodeTaskType;
 use App\Models\Service;
@@ -201,4 +203,43 @@ public function initCluster(InitClusterFormRequest $request)
             $taskGroup->tasks()->createMany($tasks);
         });
     }
+
+    public function joinCluster(JoinClusterFormRequest $request)
+    {
+        DB::transaction(function () use ($request) {
+            $taskGroup = NodeTaskGroup::create([
+                'type' => NodeTaskGroupType::JoinSwarm,
+                'swarm_id' => $request->swarm_id,
+                'team_id' => auth()->user()->current_team_id,
+                'node_id' => $request->node_id,
+                'invoker_id' => auth()->user()->id,
+            ]);
+
+            $node = Node::findOrFail($request->node_id);
+            $node->swarm_id = $request->swarm_id;
+            $node->save();
+
+            $remoteAddrs = collect($taskGroup->swarm->data->managerNodes)->map(fn(SwarmData\ManagerNode $node) => $node->addr)->toArray();
+
+            $joinToken = match ($request->role) {
+                'manager' => $taskGroup->swarm->data->joinTokens->manager,
+                'worker' => $taskGroup->swarm->data->joinTokens->worker,
+            };
+
+            $taskGroup->tasks()->create([
+                'type' => NodeTaskType::JoinSwarm,
+                'meta' => JoinSwarmMeta::from(['swarmId' => $request->swarm_id, 'role' => $request->role]),
+                'payload' => [
+                    'JoinSpec' => [
+                        'ListenAddr' => '0.0.0.0:2377',
+                        'AdvertiseAddr' => $request->advertise_addr,
+                        'DataPathAddr' => $request->advertise_addr,
+                        'RemoteAddrs' => $remoteAddrs,
+                        'JoinToken' => $joinToken,
+                        'Availability' => 'active',
+                    ],
+                ]
+            ]);
+        });
+    }
 }
diff --git a/app/Http/Requests/NodeTask/InitClusterFormRequest.php b/app/Http/Requests/NodeTask/InitClusterFormRequest.php
@@ -14,7 +14,7 @@ public function authorize(): bool
     public function rules(): array
     {
         return [
-            'node_id' => ['required'],
+            'node_id' => ['required', 'exists:nodes,id'],
             'name' => ['required', 'string', 'max:255'],
             'advertise_addr' => ['required', 'ipv4'],
             'force_new_cluster' => ['boolean'],

diff --git a/app/Http/Requests/NodeTask/JoinClusterFormRequest.php b/app/Http/Requests/NodeTask/JoinClusterFormRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests\NodeTask;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class JoinClusterFormRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'node_id' => ['required', 'exists:nodes,id'],
+            'swarm_id' => ['required', 'exists:swarms,id'],
+            'role' => ['required', 'in:manager,worker'],
+            'advertise_addr' => ['exclude_if:role,worker', 'required', 'ipv4'],
+        ];
+    }
+}
diff --git a/app/Models/DeploymentData/Process.php b/app/Models/DeploymentData/Process.php
@@ -202,11 +202,18 @@ public function asNodeTasks(Deployment $deployment): array
             $args = array_slice($splitCmd, 1);
         }
 
-        $dockerRegistry = $deployment->service->swarm->data->findRegistry($this->dockerRegistryId);
-        if ($dockerRegistry === null) {
+        $dockerRegistry = $this->dockerRegistryId
+            ? $deployment->service->swarm->data->findRegistry($this->dockerRegistryId)
+            : null;
+
+        if ($this->dockerRegistryId && is_null($dockerRegistry)) {
             throw new Exception("Docker registry '{$this->dockerRegistryId}' not found");
         }
 
+        $authConfigName = $dockerRegistry
+            ? $dockerRegistry->dockerName
+            : "";
+
         $tasks[] = [
             'type' => NodeTaskType::PullDockerImage,
             'meta' => PullDockerImageMeta::from([
@@ -217,7 +224,7 @@ public function asNodeTasks(Deployment $deployment): array
                 'dockerImage' => $this->dockerImage,
             ]),
             'payload' => [
-                'AuthConfigName' => $dockerRegistry->dockerName,
+                'AuthConfigName' => $authConfigName,
                 'Image' => $this->dockerImage,
                 'PullOptions' => (object) [],
             ],
@@ -285,7 +292,7 @@ public function asNodeTasks(Deployment $deployment): array
             'type' => $actionUpdate ? NodeTaskType::UpdateService : NodeTaskType::CreateService,
             'meta' => $actionUpdate ? UpdateServiceMeta::from($serviceTaskMeta) : CreateServiceMeta::from($serviceTaskMeta),
             'payload' => [
-                'AuthConfigName' => $dockerRegistry->dockerName,
+                'AuthConfigName' => $authConfigName,
                 'ReleaseCommand' => $this->getReleaseCommandPayload($deployment, $labels),
                 'SecretVars' => (object) $this->getSecretVars($previous, $labels),
                 'SwarmServiceSpec' => [
@@ -365,7 +372,7 @@ public function asNodeTasks(Deployment $deployment): array
                 'type' => $actionUpdate ? NodeTaskType::UpdateService : NodeTaskType::CreateService,
                 'meta' => $actionUpdate ? UpdateServiceMeta::from($workerTaskMeta) : CreateServiceMeta::from($workerTaskMeta),
                 'payload' => [
-                    'AuthConfigName' => $dockerRegistry->dockerName,
+                    'AuthConfigName' => $authConfigName,
                     'ReleaseCommand' => (object) [],
                     'SecretVars' => (object) $this->getWorkerSecretVars($worker, $labels),
                     'SwarmServiceSpec' => [

diff --git a/app/Models/Node.php b/app/Models/Node.php
@@ -64,7 +64,11 @@ protected static function booted(): void
                     $subscription->stopCancelation();
                 }
 
-                $subscription->updateQuantity($nodesCount);
+                if ($subscription->onTrial()) {
+                    $subscription->doNotBill()->updateQuantity($nodesCount);
+                } else {
+                    $subscription->updateQuantity($nodesCount);
+                }
             }
         });
     }

diff --git a/app/Models/NodeData.php b/app/Models/NodeData.php
@@ -4,13 +4,15 @@
 
 use App\Models\NodeData\DockerData;
 use App\Models\NodeData\HostData;
+use App\Models\NodeData\NodeRole;
 use Spatie\LaravelData\Data;
 
 class NodeData extends Data {
     public function __construct(
         public string $version,
         public DockerData $docker,
-        public HostData $host
+        public HostData $host,
+        public NodeRole $role,
     ) {
 
     }

diff --git a/app/Models/NodeData/NodeRole.php b/app/Models/NodeData/NodeRole.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Models\NodeData;
+
+enum NodeRole: string
+{
+    case Manager = 'manager';
+    case Worker = 'worker';
+}
diff --git a/app/Models/NodeTaskGroupType.php b/app/Models/NodeTaskGroupType.php
@@ -12,4 +12,5 @@ enum NodeTaskGroupType: int
     case UpdateDockerRegistries = 5;
     case UpdateS3Storages = 6;
     case CreateBackup = 7;
+    case JoinSwarm = 8;
 }
diff --git a/app/Models/NodeTaskType.php b/app/Models/NodeTaskType.php
@@ -26,6 +26,8 @@
 use App\Events\NodeTasks\DownloadAgentUpgrade\DownloadAgentUpgradeFailed;
 use App\Events\NodeTasks\InitSwarm\InitSwarmCompleted;
 use App\Events\NodeTasks\InitSwarm\InitSwarmFailed;
+use App\Events\NodeTasks\JoinSwarm\JoinSwarmCompleted;
+use App\Events\NodeTasks\JoinSwarm\JoinSwarmFailed;
 use App\Events\NodeTasks\PullDockerImage\PullDockerImageCompleted;
 use App\Events\NodeTasks\PullDockerImage\PullDockerImageFailed;
 use App\Events\NodeTasks\RebuildCaddyConfig\ApplyCaddyConfigCompleted;
@@ -66,6 +68,8 @@
 use App\Models\NodeTasks\DownloadAgentUpgrade\DownloadAgentUpgradeResult;
 use App\Models\NodeTasks\InitSwarm\InitSwarmMeta;
 use App\Models\NodeTasks\InitSwarm\InitSwarmResult;
+use App\Models\NodeTasks\JoinSwarm\JoinSwarmMeta;
+use App\Models\NodeTasks\JoinSwarm\JoinSwarmResult;
 use App\Models\NodeTasks\PullDockerImage\PullDockerImageMeta;
 use App\Models\NodeTasks\PullDockerImage\PullDockerImageResult;
 use App\Models\NodeTasks\ServiceExec\ServiceExecMeta;
@@ -101,6 +105,7 @@ enum NodeTaskType: int
     case CheckS3Storage = 16;
     case ServiceExec = 17;
     case UploadS3File = 18;
+    case JoinSwarm = 19;
 
     public function meta(): string
     {
@@ -123,7 +128,8 @@ public function meta(): string
             self::CreateS3Storage => CreateS3StorageMeta::class,
             self::CheckS3Storage => CheckS3StorageMeta::class,
             self::ServiceExec => ServiceExecMeta::class,
-            self::UploadS3File => UploadS3FileMeta::class
+            self::UploadS3File => UploadS3FileMeta::class,
+            self::JoinSwarm => JoinSwarmMeta::class,
         };
     }
 
@@ -148,7 +154,8 @@ public function result(): string
             self::CreateS3Storage => CreateS3StorageResult::class,
             self::CheckS3Storage => CheckS3StorageResult::class,
             self::ServiceExec => ServiceExecResult::class,
-            self::UploadS3File => UploadS3FileResult::class
+            self::UploadS3File => UploadS3FileResult::class,
+            self::JoinSwarm => JoinSwarmResult::class,
         };
     }
 
@@ -173,7 +180,8 @@ public function completed(): string
             self::CreateS3Storage => CreateS3StorageCompleted::class,
             self::CheckS3Storage => CheckS3StorageCompleted::class,
             self::ServiceExec => ServiceExecCompleted::class,
-            self::UploadS3File => UploadS3FileCompleted::class
+            self::UploadS3File => UploadS3FileCompleted::class,
+            self::JoinSwarm => JoinSwarmCompleted::class,
         };
     }
 
@@ -198,7 +206,8 @@ public function failed(): string
             self::CreateS3Storage => CreateS3StorageFailed::class,
             self::CheckS3Storage => CheckS3StorageFailed::class,
             self::ServiceExec => ServiceExecFailed::class,
-            self::UploadS3File => UploadS3FileFailed::class
+            self::UploadS3File => UploadS3FileFailed::class,
+            self::JoinSwarm => JoinSwarmFailed::class,
         };
     }
 }