From 7125e28b7445e7598223eaf3d8ee1fd068c750c0 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 2 Mar 2024 20:34:10 +0000 Subject: [PATCH 1/3] cluster: extend usage of the ZoneRegionsFileName constant Signed-off-by: Alejandro Mery --- pkg/cluster/regions.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cluster/regions.go b/pkg/cluster/regions.go index 7745435..a79ced5 100644 --- a/pkg/cluster/regions.go +++ b/pkg/cluster/regions.go @@ -191,7 +191,7 @@ func (z *Zone) SyncRegions() error { } func (z *Zone) syncZoneRegions() error { - name := filepath.Join(z.Name, "regions") + name := filepath.Join(z.Name, ZoneRegionsFileName) if len(z.Regions) > 0 { var buf bytes.Buffer @@ -210,7 +210,7 @@ func (z *Zone) syncZoneRegions() error { // SyncRegions writes to the file system the regions covered // by this meta-region func (r *Region) SyncRegions() error { - name := filepath.Join(r.Name, "regions") + name := filepath.Join(r.Name, ZoneRegionsFileName) if len(r.Regions) > 0 { var buf bytes.Buffer -- 2.17.1 From d3bbe6d270852c570a524f8ea35058aa08586b25 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 2 Mar 2024 20:18:52 +0000 Subject: [PATCH 2/3] cluster: introduce Region.Cluster and m/{region}/k8s_token Signed-off-by: Alejandro Mery --- pkg/cluster/cluster_scan.go | 33 +++++++++++++++++++ pkg/cluster/regions.go | 64 ++++++++++++++++++++++++++++++++++--- 2 files changed, 92 insertions(+), 5 deletions(-) diff --git a/pkg/cluster/cluster_scan.go b/pkg/cluster/cluster_scan.go index 4b453d4..79eda5d 100644 --- a/pkg/cluster/cluster_scan.go +++ b/pkg/cluster/cluster_scan.go @@ -4,6 +4,7 @@ import ( "io/fs" "path" "sort" + "strings" "darvaza.org/core" ) @@ -12,6 +13,10 @@ const ( // ZoneRegionsFileName indicates the file containing // region names as references ZoneRegionsFileName = "regions" + + // RegionClusterTokenFileName contains the kubernetes + // token of the cluster this region represents + RegionClusterTokenFileName = "k8s_token" ) func (m *Cluster) scan(opts *ScanOptions) error { @@ -186,6 +191,8 @@ func (z *Zone) scan() error { switch { case name == ZoneRegionsFileName: err = z.loadRegions() + case name == RegionClusterTokenFileName: + err = z.loadClusterToken() case e.IsDir(): err = z.scanSubdirectory(name) default: @@ -218,6 +225,32 @@ func (z *Zone) loadRegions() error { return err } +func (z *Zone) loadClusterToken() error { + var token string + + filename := path.Join(z.Name, RegionClusterTokenFileName) + lines, err := z.zones.ReadLines(filename) + if err != nil { + return err + } + + // first non-empty line + for _, s := range lines { + s = strings.TrimSpace(s) + if s != "" { + token = s + break + } + } + + err = z.zones.setRegionClusterToken(z.Name, token) + if err != nil { + err = core.Wrap(err, filename) + } + + return err +} + func (z *Zone) scanSubdirectory(name string) error { m := &Machine{ zone: z, diff --git a/pkg/cluster/regions.go b/pkg/cluster/regions.go index a79ced5..e2215a5 100644 --- a/pkg/cluster/regions.go +++ b/pkg/cluster/regions.go @@ -16,6 +16,7 @@ type Region struct { zones []*Zone Name string + Cluster *string `json:",omitempty" yaml:",omitempty"` Regions []string `json:",omitempty" yaml:",omitempty"` } @@ -106,6 +107,26 @@ func (m *Cluster) setRegionZones(name string, zones ...*Zone) { }) } +func (m *Cluster) setRegionClusterToken(name string, token string) error { + for i := range m.Regions { + r := &m.Regions[i] + + if r.Name == name { + // found + r.Cluster = &token + return nil + } + } + + // new + m.Regions = append(m.Regions, Region{ + m: m, + Name: name, + Cluster: &token, + }) + return nil +} + func (m *Cluster) appendRegionRegions(name string, subs ...string) { for i := range m.Regions { r := &m.Regions[i] @@ -210,9 +231,25 @@ func (z *Zone) syncZoneRegions() error { // SyncRegions writes to the file system the regions covered // by this meta-region func (r *Region) SyncRegions() error { + if err := r.syncRegionsFile(); err != nil { + return err + } + + return r.syncClusterFile() +} + +func (r *Region) mkdir() error { + return r.m.MkdirAll(r.Name) +} + +func (r *Region) syncRegionsFile() error { + var err error + name := filepath.Join(r.Name, ZoneRegionsFileName) - if len(r.Regions) > 0 { + if len(r.Regions) == 0 { + err = r.m.RemoveFile(name) + } else if err = r.mkdir(); err == nil { var buf bytes.Buffer for _, s := range r.Regions { @@ -220,12 +257,29 @@ func (r *Region) SyncRegions() error { _, _ = buf.WriteRune('\n') } - if err := r.m.MkdirAll(r.Name); err != nil { - return err + err = r.m.WriteStringFile(buf.String(), name) + } + + return err +} + +func (r *Region) syncClusterFile() error { + var err error + + name := filepath.Join(r.Name, RegionClusterTokenFileName) + + if r.Cluster == nil { + err = r.m.RemoveFile(name) + } else if err = r.mkdir(); err == nil { + var buf bytes.Buffer + + _, _ = buf.WriteString(*r.Cluster) + if buf.Len() > 0 { + _, _ = buf.WriteRune('\n') } - return r.m.WriteStringFile(buf.String(), name) + err = r.m.WriteStringFile(buf.String(), name) } - return r.m.RemoveFile(name) + return err } -- 2.17.1 From 019143820f943f6fa19f16976e20354a2579a77f Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 2 Mar 2024 21:34:37 +0000 Subject: [PATCH 3/3] 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) -- 2.17.1