Compare commits

..

13 Commits

Author SHA1 Message Date
amery 01eae6bee9 env: export ZONE{zoneID}_REGION
Signed-off-by: Alejandro Mery <amery@jpi.io>
2024-03-02 22:59:38 +00:00
amery 4bb1246292 env: add REGIONS list to output
Signed-off-by: Alejandro Mery <amery@jpi.io>
2024-03-02 22:59:38 +00:00
amery f5d76ad6a5 env: add []string writer
Signed-off-by: Alejandro Mery <amery@jpi.io>
2024-03-02 22:59:38 +00:00
amery b7016f28d3 env: use foo= instead of foo="" for empty variables
to improve readability

Signed-off-by: Alejandro Mery <amery@jpi.io>
2024-03-02 22:59:38 +00:00
amery 1d3db78dd6 Merge branch 'pr-amery-regioniter' into next-amery 2024-03-02 22:30:31 +00:00
amery 2075b2b730 cluster: add recursive RegionIterator to Zone
Signed-off-by: Alejandro Mery <amery@jpi.io>
2024-03-02 22:28:11 +00:00
amery cedca2d3d8 cluster: introduce RegionIterator
Signed-off-by: Alejandro Mery <amery@jpi.io>
2024-03-02 22:28:11 +00:00
amery ae9f941bfc cluster: decouple getRegion() from finishRegion()
Signed-off-by: Alejandro Mery <amery@jpi.io>
2024-03-02 22:28:11 +00:00
amery 48cfc710f8 Merge branch 'pr-amery-k8s_token' into next-amery 2024-03-02 22:09:43 +00:00
amery 0bb8375301 Merge branch 'pr-amery-wireguard-ini' into next-amery 2024-03-02 22:09:40 +00:00
amery 299556544d cluster: remove k8s_token files from zones on write if found
Signed-off-by: Alejandro Mery <amery@jpi.io>
2024-03-02 22:09:23 +00:00
amery 464c968381 cluster: introduce Region.Cluster and m/{region}/k8s_token
Signed-off-by: Alejandro Mery <amery@jpi.io>
2024-03-02 21:30:37 +00:00
amery d51275fb1e cluster: extend usage of the ZoneRegionsFileName constant
Signed-off-by: Alejandro Mery <amery@jpi.io>
2024-03-02 20:59:01 +00:00
3 changed files with 2 additions and 37 deletions
-1
View File
@@ -1,2 +1 @@
.tmp
.version
+2 -5
View File
@@ -2,8 +2,6 @@
package main
import (
_ "embed"
"github.com/spf13/cobra"
)
@@ -14,9 +12,8 @@ const (
var (
rootCmd = &cobra.Command{
Use: CmdName,
Short: "control tool for jpi.cloud",
Version: version,
Use: CmdName,
Short: "control tool for jpi.cloud",
}
)
-31
View File
@@ -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)
}