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

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

pkg/cluster/cluster_scan.go

@@ -4,6 +4,7 @@ import (
 	"io/fs"
 	"path"
 	"sort"
+	"strings"
 
 	"darvaza.org/core"
 )
@@ -225,22 +226,26 @@ 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 {
-		var token string
+	if err != nil {
+		return err
+	}
 
-		for _, s := range lines {
-			if s != "" {
-				token = s
-				break
-			}
+	// 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)
-		}
+	err = z.zones.setRegionClusterToken(z.Name, token)
+	if err != nil {
+		err = core.Wrap(err, filename)
 	}
 
 	return err

pkg/cluster/regions.go

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