Merge branch 'pr-amery-k8s_token' into next-amery

Merge branch 'pr-amery-wireguard-ini' into next-amery
cluster: remove k8s_token files from zones on write if found
2024-03-02 21:35:28 +00:00 · 2024-03-02 21:35:24 +00:00 · 2024-03-02 21:34:37 +00:00
1 changed files with 10 additions and 17 deletions
@@ -199,7 +199,16 @@ func (z *Zone) SyncRegions() error {
 	err := z.syncZoneRegions()
 	if err == nil {
 		z.ForEachMachine(func(p *Machine) bool {
-			err = z.syncMachineRegions(p)
+			if p.IsActive() {
+				err = p.RemoveFile("region")
+			} else {
+				err = p.WriteStringFile("none\n", "region")
+			}
+
+			if err == nil {
+				err = p.RemoveFile(RegionClusterTokenFileName)
+			}
+
 			return err != nil
 		})
 	}
@@ -207,22 +216,6 @@ func (z *Zone) SyncRegions() error {
 	return err
 }

-func (*Zone) syncMachineRegions(p *Machine) error {
-	var err error
-
-	if p.IsActive() {
-		err = p.RemoveFile("region")
-	} else {
-		err = p.WriteStringFile("none\n", "region")
-	}
-
-	if err == nil {
-		err = p.RemoveFile(RegionClusterTokenFileName)
-	}
-
-	return err
-}
-
 func (z *Zone) syncZoneRegions() error {
 	name := filepath.Join(z.Name, ZoneRegionsFileName)
Author	SHA1	Message	Date
amery	c8c330d93a	Merge branch 'pr-amery-k8s_token' into next-amery	2024-03-02 21:35:28 +00:00
amery	111951a86c	Merge branch 'pr-amery-wireguard-ini' into next-amery	2024-03-02 21:35:24 +00:00
amery	3efe9c1d20	cluster: remove k8s_token files from zones on write if found Signed-off-by: Alejandro Mery <amery@jpi.io>	2024-03-02 21:34:37 +00:00