Fix: ensure that only servers that belong to the cluster are deleted …

…from the project
vitobotta · Aug 20, 2021 · 36056e8 · 36056e8
1 parent 3300651
commit 36056e8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hetzner-k3s (0.3.7)
+    hetzner-k3s (0.3.8)
       bcrypt_pbkdf
       ed25519
       http

diff --git a/README.md b/README.md
@@ -227,6 +227,9 @@ Once the cluster is ready you can create persistent volumes out of the box with
 
 ## changelog
 
+- 0.3.8
+  - Fix: added a check on a label to ensure that only servers that belong to the cluster are deleted from the project.
+
 - 0.3.7
   - Ensure that the cluster name only contains lowercase letters, digits and dashes for compatibility with the cloud controller manager
 

diff --git a/lib/hetzner/k3s/cluster.rb b/lib/hetzner/k3s/cluster.rb
@@ -501,7 +501,7 @@ def find_flannel_interface(server)
     end
 
     def all_servers
-      @all_servers ||= hetzner_client.get("/servers")["servers"]
+      @all_servers ||= hetzner_client.get("/servers")["servers"].select{ |server| belongs_to_cluster?(server) == true }
     end
 
     def masters
@@ -624,4 +624,8 @@ def ugrade_plan_manifest_path
       temp_file_path
     end
 
+    def belongs_to_cluster?(server)
+      server.dig("labels", "cluster") == cluster_name
+    end
+
 end
diff --git a/lib/hetzner/k3s/version.rb b/lib/hetzner/k3s/version.rb
@@ -1,5 +1,5 @@
 module Hetzner
   module K3s
-    VERSION = "0.3.7"
+    VERSION = "0.3.8"
   end
 end