From 299556544d7f15a7ade8f7179c231e71dbf4bf1c Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 2 Mar 2024 21:34:37 +0000 Subject: [PATCH] cluster: remove k8s_token files from zones on write if found Signed-off-by: Alejandro Mery --- pkg/cluster/regions.go | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkg/cluster/regions.go b/pkg/cluster/regions.go index e2215a5..03ac85e 100644 --- a/pkg/cluster/regions.go +++ b/pkg/cluster/regions.go @@ -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)