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
parent 464c968381
commit 299556544d
1 changed files with 17 additions and 5 deletions
@@ -199,11 +199,7 @@ func (z *Zone) SyncRegions() error {
 	err := z.syncZoneRegions()
 	if err == nil {
 		z.ForEachMachine(func(p *Machine) bool {
-			if p.IsActive() {
-				err = p.RemoveFile("region")
-			} else {
-				err = p.WriteStringFile("none\n", "region")
-			}
+			err = z.syncMachineRegions(p)
 			return err != nil
 		})
 	}
@@ -211,6 +207,22 @@ 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)