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

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

.gitignore

@@ -1,2 +1 @@
 .tmp
-.version

cmd/jpictl/main.go

@@ -2,8 +2,6 @@
 package main
 
 import (
-	_ "embed"
-
 	"github.com/spf13/cobra"
 )
 
@@ -16,7 +14,6 @@ var (
 	rootCmd = &cobra.Command{
 		Use:   CmdName,
 		Short: "control tool for jpi.cloud",
-		Version: version,
 	}
 )
 

cmd/jpictl/version.go

@@ -1,31 +0,0 @@
-package main
-
-import (
-	_ "embed"
-
-	"fmt"
-	"os"
-
-	"github.com/spf13/cobra"
-)
-
-//go:generate sh -c "git describe | tr -d '\r\n' > .version"
-//go:embed .version
-var version string
-
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Returns jpictl's version",
-	Args:  cobra.NoArgs,
-	Run: func(_ *cobra.Command, _ []string) {
-		_, _ = fmt.Fprintf(os.Stdout, "%s\n", version)
-	},
-}
-
-func init() {
-	if version == "" {
-		version = "undetermined"
-	}
-
-	rootCmd.AddCommand(versionCmd)
-}

pkg/cluster/cluster_scan.go

@@ -4,7 +4,6 @@ import (
 	"io/fs"
 	"path"
 	"sort"
-	"strings"
 
 	"darvaza.org/core"
 )
@@ -226,17 +225,12 @@ 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 {
-		s = strings.TrimSpace(s)
 			if s != "" {
 				token = s
 				break
@@ -247,6 +241,7 @@ func (z *Zone) loadClusterToken() error {
 		if err != nil {
 			err = core.Wrap(err, filename)
 		}
+	}
 
 	return err
 }

pkg/cluster/env.go

@@ -4,14 +4,12 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"sort"
 	"strings"
 )
 
 // Env is a shell environment factory for this cluster
 type Env struct {
 	ZoneIterator
-	RegionIterator
 
 	cephFSID string
 	export   bool
@@ -26,7 +24,6 @@ func (m *Cluster) Env(export bool) (*Env, error) {
 
 	env := &Env{
 		ZoneIterator: m,
-		RegionIterator: m,
 		cephFSID:     fsid.String(),
 		export:       export,
 	}
@@ -46,22 +43,6 @@ func (m *Env) Zones() []int {
 	return zones
 }
 
-// Regions returns the list of primary regions
-func (m *Env) Regions() []string {
-	var regions []string
-
-	m.ForEachRegion(func(r *Region) bool {
-		if r.Cluster != nil {
-			regions = append(regions, r.Name)
-		}
-
-		return false
-	})
-
-	sort.Strings(regions)
-	return regions
-}
-
 // WriteTo generates environment variables for shell scripts
 func (m *Env) WriteTo(w io.Writer) (int64, error) {
 	var buf bytes.Buffer
@@ -70,7 +51,6 @@ func (m *Env) WriteTo(w io.Writer) (int64, error) {
 		m.writeEnvVar(&buf, m.cephFSID, "FSID")
 	}
 
-	m.writeEnvVarStrings(&buf, m.Regions(), "REGIONS")
 	m.writeEnvVarInts(&buf, m.Zones(), "ZONES")
 
 	m.ForEachZone(func(z *Zone) bool {
@@ -94,9 +74,6 @@ func (m *Env) writeEnvZone(w io.Writer, z *Zone) {
 	gateways, _ := z.GatewayIDs()
 	m.writeEnvVarInts(w, gateways, "ZONE%v_%s", zoneID, "GW")
 
-	// ZONE{zoneID}_REGION
-	m.writeEnvVar(w, genEnvZoneRegion(z), "ZONE%v_%s", zoneID, "REGION")
-
 	// Ceph
 	monitors := z.GetCephMonitors()
 	// MON{zoneID}_NAME
@@ -108,29 +85,22 @@ func (m *Env) writeEnvZone(w io.Writer, z *Zone) {
 }
 
 func (m *Env) writeEnvVarInts(w io.Writer, value []int, name string, args ...any) {
+	var s string
+
+	if n := len(value); n > 0 {
 		var buf bytes.Buffer
 
-	for _, v := range value {
+		for i, v := range value {
-		if buf.Len() > 0 {
+			if i != 0 {
 				_, _ = fmt.Fprint(&buf, " ")
 			}
 			_, _ = fmt.Fprintf(&buf, "%v", v)
 		}
 
-	m.writeEnvVar(w, buf.String(), name, args...)
+		s = buf.String()
 	}
 
-func (m *Env) writeEnvVarStrings(w io.Writer, value []string, name string, args ...any) {
+	m.writeEnvVar(w, s, name, args...)
-	var buf bytes.Buffer
-
-	for _, v := range value {
-		if buf.Len() > 0 {
-			_, _ = fmt.Fprint(&buf, " ")
-		}
-		_, _ = fmt.Fprintf(&buf, "%s", v)
-	}
-
-	m.writeEnvVar(w, buf.String(), name, args...)
 }
 
 func (m *Env) writeEnvVar(w io.Writer, value string, name string, args ...any) {
@@ -147,13 +117,9 @@ func (m *Env) writeEnvVar(w io.Writer, value string, name string, args ...any) {
 	if name != "" {
 		value = strings.TrimSpace(value)
 
-		if value == "" {
-			_, _ = fmt.Fprintf(w, "%s%s=\n", prefix, name)
-		} else {
 		_, _ = fmt.Fprintf(w, "%s%s=%q\n", prefix, name, value)
 	}
 }
-}
 
 func genEnvZoneNodes(z *Zone) string {
 	if n := z.Len(); n > 0 {
@@ -169,21 +135,6 @@ func genEnvZoneNodes(z *Zone) string {
 	return ""
 }
 
-func genEnvZoneRegion(z *Zone) string {
-	var region string
-
-	z.ForEachRegion(func(r *Region) bool {
-		if r.Cluster != nil {
-			region = r.Name
-			return true
-		}
-
-		return false
-	})
-
-	return region
-}
-
 func genEnvZoneCephMonNames(m Machines) string {
 	var buf strings.Builder
 	m.ForEachMachine(func(p *Machine) bool {

pkg/cluster/regions.go

@@ -8,16 +8,8 @@ import (
 var (
 	_ MachineIterator = (*Region)(nil)
 	_ ZoneIterator    = (*Region)(nil)
-
-	_ RegionIterator = (*Zone)(nil)
-	_ RegionIterator = (*Cluster)(nil)
 )
 
-// A RegionIterator is a set of Regions we can iterate on
-type RegionIterator interface {
-	ForEachRegion(func(*Region) bool)
-}
-
 // Region represents a group of zones geographically related
 type Region struct {
 	m     *Cluster
@@ -153,28 +145,6 @@ func (m *Cluster) appendRegionRegions(name string, subs ...string) {
 	})
 }
 
-// ForEachRegion calls a function on all regions this zone belongs to.
-func (z *Zone) ForEachRegion(fn func(*Region) bool) {
-	if fn == nil {
-		return
-	}
-
-	z.zones.ForEachRegion(func(r *Region) bool {
-		var match bool
-
-		r.ForEachZone(func(z2 *Zone) bool {
-			match = (z == z2)
-			return match
-		})
-
-		if match && fn(r) {
-			return true
-		}
-
-		return false
-	})
-}
-
 func (z *Zone) appendRegions(regions ...string) error {
 	for _, s := range regions {
 		// TODO: validate
@@ -198,7 +168,7 @@ func (m *Cluster) finishRegion(r *Region) {
 	r.m = m
 	sub := []string{}
 	for _, name := range r.Regions {
-		r2, ok := m.getFinishRegion(name)
+		r2, ok := m.getRegion(name)
 		if !ok {
 			m.warn(nil).WithField("region", name).Print("unknown region")
 			continue
@@ -213,19 +183,12 @@ func (m *Cluster) finishRegion(r *Region) {
 func (m *Cluster) getRegion(name string) (*Region, bool) {
 	for i := range m.Regions {
 		r := &m.Regions[i]
+
 		if name == r.Name {
-			return r, true
-		}
-	}
-
-	return nil, false
-}
-
-func (m *Cluster) getFinishRegion(name string) (*Region, bool) {
-	if r, ok := m.getRegion(name); ok {
 			m.finishRegion(r)
 			return r, true
 		}
+	}
 
 	return nil, false
 }
@@ -236,25 +199,13 @@ func (z *Zone) SyncRegions() error {
 	err := z.syncZoneRegions()
 	if err == nil {
 		z.ForEachMachine(func(p *Machine) bool {
-			err = z.syncMachineRegions(p)
-			return err != nil
-		})
-	}
-
-	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")
 			}
-
+			return err != nil
-	if err == nil {
+		})
-		err = p.RemoveFile(RegionClusterTokenFileName)
 	}
 
 	return err