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

Signed-off-by: Alejandro Mery <amery@jpi.io>

pkg/cluster/cluster_scan.go

@@ -4,7 +4,6 @@ import (
 	"io/fs"
 	"path"
 	"sort"
-	"strings"
 
 	"darvaza.org/core"
 )
@@ -226,26 +225,22 @@ func (z *Zone) loadRegions() error {
 }
 
 func (z *Zone) loadClusterToken() error {
-	var token string
-
 	filename := path.Join(z.Name, RegionClusterTokenFileName)
 	lines, err := z.zones.ReadLines(filename)
-	if err != nil {
+	if err == nil {
-		return err
+		var token string
-	}
 
-	// first non-empty line
+		for _, s := range lines {
-	for _, s := range lines {
+			if s != "" {
-		s = strings.TrimSpace(s)
+				token = s
-		if s != "" {
+				break
-			token = s
+			}
-			break
 		}
-	}
 
-	err = z.zones.setRegionClusterToken(z.Name, token)
+		err = z.zones.setRegionClusterToken(z.Name, token)
-	if err != nil {
+		if err != nil {
-		err = core.Wrap(err, filename)
+			err = core.Wrap(err, filename)
+		}
 	}
 
 	return err

pkg/cluster/regions.go

@@ -204,11 +204,6 @@ func (z *Zone) SyncRegions() error {
 			} else {
 				err = p.WriteStringFile("none\n", "region")
 			}
-
-			if err == nil {
-				err = p.RemoveFile(RegionClusterTokenFileName)
-			}
-
 			return err != nil
 		})
 	}