Merge pull request 'wireguard: switch from gcfg to asciigoat.org/ini/basic' (#8) from pr-amery-wireguard-ini into main

Reviewed-on: #8

.gitignore

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

cloud.yaml

@@ -1,155 +0,0 @@
-dir: m
-name: m
-domain: jpi.cloud
-ceph_fsid: 28180b9b-6d5d-4be0-bb5b-e4b04bf03804
-regions:
-  - name: eu
-    cluster: K102eb227eec765a3389ba82944c0c78ab1f14f3b4383831f47416598e54d64abbb::server:567b2023506e45f7ec0009a991824f1c
-    regions:
-      - de
-      - nl
-  - name: earth
-    regions:
-      - europe
-      - us
-  - name: europe
-    regions:
-      - eu
-      - uk
-zones:
-  - id: 1
-    name: ssd-lon
-    regions:
-      - uk
-    machines:
-      - id: 3
-        public:
-          - 63.250.53.5
-          - 2602:ff16:7:0:1:66:0:1
-        rings:
-          - ring: 0
-            enabled: true
-            keys:
-              privatekey: WJY1yrd14c0gY4qqq1O8BPck46TVYebXrT+OoMbEqG8=
-              publickey: aDXNwapVjufcuQKfBN+waJObe1TaeeaSNl1suA0u+00=
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: 2CDO+x8HVKfw1/iqC2WkwIEQyWZsC9XPW1otqxarR0o=
-              publickey: untmMfW2W4OiMgG/6nAysoivXtDh7cZ9/rxhgJ4OlC4=
-      - id: 4
-        ceph_monitor: true
-        public:
-          - 63.250.53.164
-          - 2602:ff16:7:0:1:50:0:1
-        rings:
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: wE05rSTPSlX9CUdyglpRsNqMVdh8bZSvmUlalGXArEE=
-              publickey: f7AcZy4H2qfi7BRtRA82VdJAqc+IXU90k88GKBp9piM=
-      - id: 5
-        public:
-          - 63.250.53.135
-          - 2602:ff16:7:0:1:156:0:1
-        rings:
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: oMLrZ8ZmNeWrVroGTh9lx9cJC1enWCF5VfIkv8t+jmk=
-              publickey: 9cUNKM8TPbD8BRjV7TG9/BuTq+2JO8KyrPCx69KW+Bk=
-      - id: 7
-        public:
-          - 107.155.122.3
-          - 2602:ff16:7:0:1:6d:0:1
-        rings:
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: iN4Rc3J36APlkIP/ksSpHIwAuxC/ehYLwGQ5va1AhG8=
-              publickey: XGVXDmxQajHpsgpzgrp+r/ZWxZUaodTpvGBJuLlZ0n4=
-  - id: 2
-    name: ssd-ams
-    regions:
-      - nl
-    machines:
-      - id: 3
-        public:
-          - 89.233.107.128
-          - 2602:ff16:9:0:1:1a7:0:1
-        rings:
-          - ring: 0
-            enabled: true
-            keys:
-              privatekey: oHVQY976pFH1lAhCrz9c40vR/e5PIXw7ZXv6pU6A5Ho=
-              publickey: y/Gkid2Mjxo1WO9Zi7mh+DETNYKT/AAc3K3bvr9xp3c=
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: 6I/ZMxaWUTbNc+SIGkNKxgovONqv6EAvg7NeeTRrR1c=
-              publickey: 9i0XI358OOYYoxoxV5lX8siqE8uiEwCsuWLo6LoFu0Y=
-      - id: 4
-        ceph_monitor: true
-        public:
-          - 89.233.107.251
-          - 2602:ff16:9:0:1:130:0:1
-        rings:
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: SPBd5Ka29ZecKYy7BW85rW7FO9dwKwoUHlSibybPG1s=
-              publickey: QpJupYlnJc7wc3+gAlEmbFMonsqpVnYRy7f/gnPqqBw=
-      - id: 5
-        inactive: true
-        public:
-          - 89.233.107.107
-          - 2602:ff16:9:0:1:74:0:1
-        rings:
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: mJaFvu9TBwE2i0rjhfhvpB3xZmp++3BVwa7QAvWXImY=
-              publickey: HDLVEwLv0uugyZ9C1C9ZWuiaWQ1qIqqe/DAUxYI0whM=
-  - id: 3
-    name: htz-fsn
-    regions:
-      - de
-    machines:
-      - id: 1
-        ceph_monitor: true
-        public:
-          - 157.90.209.125
-          - 2a01:4f8:252:168f::2
-        rings:
-          - ring: 0
-            enabled: true
-            keys:
-              privatekey: AMz/pCgOMVh1/2rT9uCFMox+LQgH5FrE4xUeqSs0x0M=
-              publickey: K9LYog8vtRFN4nW6dJWMQ9trmRrYuLpbu/Ze5kIiBGw=
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: 2JpA1G0Dp+sEuDhKnzToz0h76o2iLP+S7Qb9itlgXVA=
-              publickey: qWmYfgeRAQ563gWLdeYs65XjGJTSE+W8WTbpLZ0e1CQ=
-  - id: 4
-    name: ssd-nyc
-    regions:
-      - us
-    machines:
-      - id: 3
-        inactive: true
-        ceph_monitor: true
-        public:
-          - 208.87.134.41
-          - 2602:ff16:3:0:1:4fa:0:1
-        rings:
-          - ring: 0
-            enabled: true
-            keys:
-              privatekey: YNDxj+QSO3p5pXw9h7lBx0cLM0kJDv3v7BYLfc8TR3I=
-              publickey: 1UFgleUufTszPM1voIcwVhd0DpYZ1HwV05U6p3IS2DE=
-          - ring: 1
-            enabled: true
-            keys:
-              privatekey: APXGKqOxx1gOr587FSN3O3gRGpkGgSjt6zGlTu49UlU=
-              publickey: av8ni/9ZUyozabzqTjIy1sOnSJuQ9p63Tu9ECVmHB2I=

cmd/jpictl/main.go

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

cmd/jpictl/version.go

@@ -0,0 +1,31 @@
+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)
+}

m/ceph.conf

@@ -1,5 +0,0 @@
-[global]
-fsid = 28180b9b-6d5d-4be0-bb5b-e4b04bf03804
-mon_initial_members = ssd-lon-4, ssd-ams-4, htz-fsn-1, ssd-nyc-3
-mon_host = 10.16.0.4, 10.32.0.4, 10.48.0.1, 10.64.0.3
-cluster_network = 10.0.0.0/8

m/earth/regions

@@ -1,2 +0,0 @@
-europe
-us

m/eu/k8s_token

@@ -1 +0,0 @@
-K102eb227eec765a3389ba82944c0c78ab1f14f3b4383831f47416598e54d64abbb::server:567b2023506e45f7ec0009a991824f1c

m/eu/regions

@@ -1,2 +0,0 @@
-de
-nl

m/europe/regions

@@ -1,2 +0,0 @@
-eu
-uk

m/htz-fsn/htz-fsn-1/hosts

@@ -1,24 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.16.0.3  ssd-lon-3
-10.16.0.4  ssd-lon-4 ssd-lon-ceph ssd-lon-k3s
-10.16.0.5  ssd-lon-5
-10.16.0.7  ssd-lon-7
-10.32.0.3  ssd-ams-3
-10.32.0.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s
-10.32.0.5  ssd-ams-5
-10.48.0.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s ceph k3s
-10.64.0.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.1.3  ssd-lon-3-0
-10.0.2.3  ssd-ams-3-0
-10.0.3.1  htz-fsn-1-0
-10.0.4.3  ssd-nyc-3-0

m/htz-fsn/htz-fsn-1/wg0.conf

@@ -1,23 +0,0 @@
-[Interface]
-# Name: htz-fsn-1-0
-Address = 10.0.3.1
-PrivateKey = AMz/pCgOMVh1/2rT9uCFMox+LQgH5FrE4xUeqSs0x0M=
-ListenPort = 51800
-
-[Peer]
-# Name: ssd-lon-3-0
-PublicKey = aDXNwapVjufcuQKfBN+waJObe1TaeeaSNl1suA0u+00=
-Endpoint = ssd-lon-3.m.jpi.cloud:51800
-AllowedIPs = 10.16.0.0/12, 10.0.1.3/32
-
-[Peer]
-# Name: ssd-ams-3-0
-PublicKey = y/Gkid2Mjxo1WO9Zi7mh+DETNYKT/AAc3K3bvr9xp3c=
-Endpoint = ssd-ams-3.m.jpi.cloud:51800
-AllowedIPs = 10.32.0.0/12, 10.0.2.3/32
-
-[Peer]
-# Name: ssd-nyc-3-0
-PublicKey = 1UFgleUufTszPM1voIcwVhd0DpYZ1HwV05U6p3IS2DE=
-Endpoint = ssd-nyc-3.m.jpi.cloud:51800
-AllowedIPs = 10.64.0.0/12, 10.0.4.3/32

m/htz-fsn/htz-fsn-1/wg0.key

@@ -1 +0,0 @@
-AMz/pCgOMVh1/2rT9uCFMox+LQgH5FrE4xUeqSs0x0M=

m/htz-fsn/htz-fsn-1/wg0.pub

@@ -1 +0,0 @@
-K9LYog8vtRFN4nW6dJWMQ9trmRrYuLpbu/Ze5kIiBGw=

m/htz-fsn/htz-fsn-1/wg1.conf

@@ -1,5 +0,0 @@
-[Interface]
-# Name: htz-fsn-1-1
-Address = 10.48.0.1
-PrivateKey = 2JpA1G0Dp+sEuDhKnzToz0h76o2iLP+S7Qb9itlgXVA=
-ListenPort = 51810

m/htz-fsn/htz-fsn-1/wg1.key

@@ -1 +0,0 @@
-2JpA1G0Dp+sEuDhKnzToz0h76o2iLP+S7Qb9itlgXVA=

m/htz-fsn/htz-fsn-1/wg1.pub

@@ -1 +0,0 @@
-qWmYfgeRAQ563gWLdeYs65XjGJTSE+W8WTbpLZ0e1CQ=

m/htz-fsn/regions

@@ -1 +0,0 @@
-de

m/ssd-ams/regions

@@ -1 +0,0 @@
-nl

m/ssd-ams/ssd-ams-3/hosts

@@ -1,24 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.16.0.3  ssd-lon-3
-10.16.0.4  ssd-lon-4 ssd-lon-ceph ssd-lon-k3s
-10.16.0.5  ssd-lon-5
-10.16.0.7  ssd-lon-7
-10.32.0.3  ssd-ams-3
-10.32.0.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s ceph k3s
-10.32.0.5  ssd-ams-5
-10.48.0.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.64.0.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.1.3  ssd-lon-3-0
-10.0.2.3  ssd-ams-3-0
-10.0.3.1  htz-fsn-1-0
-10.0.4.3  ssd-nyc-3-0

m/ssd-ams/ssd-ams-3/wg0.conf

@@ -1,23 +0,0 @@
-[Interface]
-# Name: ssd-ams-3-0
-Address = 10.0.2.3
-PrivateKey = oHVQY976pFH1lAhCrz9c40vR/e5PIXw7ZXv6pU6A5Ho=
-ListenPort = 51800
-
-[Peer]
-# Name: ssd-lon-3-0
-PublicKey = aDXNwapVjufcuQKfBN+waJObe1TaeeaSNl1suA0u+00=
-Endpoint = ssd-lon-3.m.jpi.cloud:51800
-AllowedIPs = 10.16.0.0/12, 10.0.1.3/32
-
-[Peer]
-# Name: htz-fsn-1-0
-PublicKey = K9LYog8vtRFN4nW6dJWMQ9trmRrYuLpbu/Ze5kIiBGw=
-Endpoint = htz-fsn-1.m.jpi.cloud:51800
-AllowedIPs = 10.48.0.0/12, 10.0.3.1/32
-
-[Peer]
-# Name: ssd-nyc-3-0
-PublicKey = 1UFgleUufTszPM1voIcwVhd0DpYZ1HwV05U6p3IS2DE=
-Endpoint = ssd-nyc-3.m.jpi.cloud:51800
-AllowedIPs = 10.64.0.0/12, 10.0.4.3/32

m/ssd-ams/ssd-ams-3/wg0.key

@@ -1 +0,0 @@
-oHVQY976pFH1lAhCrz9c40vR/e5PIXw7ZXv6pU6A5Ho=

m/ssd-ams/ssd-ams-3/wg0.pub

@@ -1 +0,0 @@
-y/Gkid2Mjxo1WO9Zi7mh+DETNYKT/AAc3K3bvr9xp3c=

m/ssd-ams/ssd-ams-3/wg1.conf

@@ -1,17 +0,0 @@
-[Interface]
-# Name: ssd-ams-3-1
-Address = 10.32.0.3
-PrivateKey = 6I/ZMxaWUTbNc+SIGkNKxgovONqv6EAvg7NeeTRrR1c=
-ListenPort = 51810
-
-[Peer]
-# Name: ssd-ams-4-1
-PublicKey = QpJupYlnJc7wc3+gAlEmbFMonsqpVnYRy7f/gnPqqBw=
-Endpoint = ssd-ams-4.m.jpi.cloud:51810
-AllowedIPs = 10.32.0.4/32
-
-[Peer]
-# Name: ssd-ams-5-1
-PublicKey = HDLVEwLv0uugyZ9C1C9ZWuiaWQ1qIqqe/DAUxYI0whM=
-Endpoint = ssd-ams-5.m.jpi.cloud:51810
-AllowedIPs = 10.32.0.5/32

m/ssd-ams/ssd-ams-3/wg1.key

@@ -1 +0,0 @@
-6I/ZMxaWUTbNc+SIGkNKxgovONqv6EAvg7NeeTRrR1c=

m/ssd-ams/ssd-ams-3/wg1.pub

@@ -1 +0,0 @@
-9i0XI358OOYYoxoxV5lX8siqE8uiEwCsuWLo6LoFu0Y=

m/ssd-ams/ssd-ams-4/hosts

@@ -1,24 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.16.0.3  ssd-lon-3
-10.16.0.4  ssd-lon-4 ssd-lon-ceph ssd-lon-k3s
-10.16.0.5  ssd-lon-5
-10.16.0.7  ssd-lon-7
-10.32.0.3  ssd-ams-3
-10.32.0.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s ceph k3s
-10.32.0.5  ssd-ams-5
-10.48.0.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.64.0.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.1.3  ssd-lon-3-0
-10.0.2.3  ssd-ams-3-0
-10.0.3.1  htz-fsn-1-0
-10.0.4.3  ssd-nyc-3-0

m/ssd-ams/ssd-ams-4/wg1.conf

@@ -1,17 +0,0 @@
-[Interface]
-# Name: ssd-ams-4-1
-Address = 10.32.0.4
-PrivateKey = SPBd5Ka29ZecKYy7BW85rW7FO9dwKwoUHlSibybPG1s=
-ListenPort = 51810
-
-[Peer]
-# Name: ssd-ams-3-1
-PublicKey = 9i0XI358OOYYoxoxV5lX8siqE8uiEwCsuWLo6LoFu0Y=
-Endpoint = ssd-ams-3.m.jpi.cloud:51810
-AllowedIPs = 10.32.0.3/32, 10.16.0.0/12, 10.48.0.0/12, 10.64.0.0/12, 10.0.1.3/32, 10.0.2.3/32, 10.0.3.1/32, 10.0.4.3/32
-
-[Peer]
-# Name: ssd-ams-5-1
-PublicKey = HDLVEwLv0uugyZ9C1C9ZWuiaWQ1qIqqe/DAUxYI0whM=
-Endpoint = ssd-ams-5.m.jpi.cloud:51810
-AllowedIPs = 10.32.0.5/32

m/ssd-ams/ssd-ams-4/wg1.key

@@ -1 +0,0 @@
-SPBd5Ka29ZecKYy7BW85rW7FO9dwKwoUHlSibybPG1s=

m/ssd-ams/ssd-ams-4/wg1.pub

@@ -1 +0,0 @@
-QpJupYlnJc7wc3+gAlEmbFMonsqpVnYRy7f/gnPqqBw=

m/ssd-ams/ssd-ams-5/hosts

@@ -1,24 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.16.0.3  ssd-lon-3
-10.16.0.4  ssd-lon-4 ssd-lon-ceph ssd-lon-k3s
-10.16.0.5  ssd-lon-5
-10.16.0.7  ssd-lon-7
-10.32.0.3  ssd-ams-3
-10.32.0.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s ceph k3s
-10.32.0.5  ssd-ams-5
-10.48.0.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.64.0.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.1.3  ssd-lon-3-0
-10.0.2.3  ssd-ams-3-0
-10.0.3.1  htz-fsn-1-0
-10.0.4.3  ssd-nyc-3-0

m/ssd-ams/ssd-ams-5/region

@@ -1 +0,0 @@
-none

m/ssd-ams/ssd-ams-5/wg1.conf

@@ -1,17 +0,0 @@
-[Interface]
-# Name: ssd-ams-5-1
-Address = 10.32.0.5
-PrivateKey = mJaFvu9TBwE2i0rjhfhvpB3xZmp++3BVwa7QAvWXImY=
-ListenPort = 51810
-
-[Peer]
-# Name: ssd-ams-3-1
-PublicKey = 9i0XI358OOYYoxoxV5lX8siqE8uiEwCsuWLo6LoFu0Y=
-Endpoint = ssd-ams-3.m.jpi.cloud:51810
-AllowedIPs = 10.32.0.3/32, 10.16.0.0/12, 10.48.0.0/12, 10.64.0.0/12, 10.0.1.3/32, 10.0.2.3/32, 10.0.3.1/32, 10.0.4.3/32
-
-[Peer]
-# Name: ssd-ams-4-1
-PublicKey = QpJupYlnJc7wc3+gAlEmbFMonsqpVnYRy7f/gnPqqBw=
-Endpoint = ssd-ams-4.m.jpi.cloud:51810
-AllowedIPs = 10.32.0.4/32

m/ssd-ams/ssd-ams-5/wg1.key

@@ -1 +0,0 @@
-mJaFvu9TBwE2i0rjhfhvpB3xZmp++3BVwa7QAvWXImY=

m/ssd-ams/ssd-ams-5/wg1.pub

@@ -1 +0,0 @@
-HDLVEwLv0uugyZ9C1C9ZWuiaWQ1qIqqe/DAUxYI0whM=

m/ssd-lon/regions

@@ -1 +0,0 @@
-uk

m/ssd-lon/ssd-lon-3/hosts

@@ -1,24 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.16.0.3  ssd-lon-3
-10.16.0.4  ssd-lon-4 ssd-lon-ceph ssd-lon-k3s ceph k3s
-10.16.0.5  ssd-lon-5
-10.16.0.7  ssd-lon-7
-10.32.0.3  ssd-ams-3
-10.32.0.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s
-10.32.0.5  ssd-ams-5
-10.48.0.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.64.0.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.1.3  ssd-lon-3-0
-10.0.2.3  ssd-ams-3-0
-10.0.3.1  htz-fsn-1-0
-10.0.4.3  ssd-nyc-3-0

m/ssd-lon/ssd-lon-3/wg0.conf

@@ -1,23 +0,0 @@
-[Interface]
-# Name: ssd-lon-3-0
-Address = 10.0.1.3
-PrivateKey = WJY1yrd14c0gY4qqq1O8BPck46TVYebXrT+OoMbEqG8=
-ListenPort = 51800
-
-[Peer]
-# Name: ssd-ams-3-0
-PublicKey = y/Gkid2Mjxo1WO9Zi7mh+DETNYKT/AAc3K3bvr9xp3c=
-Endpoint = ssd-ams-3.m.jpi.cloud:51800
-AllowedIPs = 10.32.0.0/12, 10.0.2.3/32
-
-[Peer]
-# Name: htz-fsn-1-0
-PublicKey = K9LYog8vtRFN4nW6dJWMQ9trmRrYuLpbu/Ze5kIiBGw=
-Endpoint = htz-fsn-1.m.jpi.cloud:51800
-AllowedIPs = 10.48.0.0/12, 10.0.3.1/32
-
-[Peer]
-# Name: ssd-nyc-3-0
-PublicKey = 1UFgleUufTszPM1voIcwVhd0DpYZ1HwV05U6p3IS2DE=
-Endpoint = ssd-nyc-3.m.jpi.cloud:51800
-AllowedIPs = 10.64.0.0/12, 10.0.4.3/32

m/ssd-lon/ssd-lon-3/wg0.key

@@ -1 +0,0 @@
-WJY1yrd14c0gY4qqq1O8BPck46TVYebXrT+OoMbEqG8=

m/ssd-lon/ssd-lon-3/wg0.pub

@@ -1 +0,0 @@
-aDXNwapVjufcuQKfBN+waJObe1TaeeaSNl1suA0u+00=

m/ssd-lon/ssd-lon-3/wg1.conf

@@ -1,23 +0,0 @@
-[Interface]
-# Name: ssd-lon-3-1
-Address = 10.16.0.3
-PrivateKey = 2CDO+x8HVKfw1/iqC2WkwIEQyWZsC9XPW1otqxarR0o=
-ListenPort = 51810
-
-[Peer]
-# Name: ssd-lon-4-1
-PublicKey = f7AcZy4H2qfi7BRtRA82VdJAqc+IXU90k88GKBp9piM=
-Endpoint = ssd-lon-4.m.jpi.cloud:51810
-AllowedIPs = 10.16.0.4/32
-
-[Peer]
-# Name: ssd-lon-5-1
-PublicKey = 9cUNKM8TPbD8BRjV7TG9/BuTq+2JO8KyrPCx69KW+Bk=
-Endpoint = ssd-lon-5.m.jpi.cloud:51810
-AllowedIPs = 10.16.0.5/32
-
-[Peer]
-# Name: ssd-lon-7-1
-PublicKey = XGVXDmxQajHpsgpzgrp+r/ZWxZUaodTpvGBJuLlZ0n4=
-Endpoint = ssd-lon-7.m.jpi.cloud:51810
-AllowedIPs = 10.16.0.7/32

m/ssd-lon/ssd-lon-3/wg1.key

@@ -1 +0,0 @@
-2CDO+x8HVKfw1/iqC2WkwIEQyWZsC9XPW1otqxarR0o=

m/ssd-lon/ssd-lon-3/wg1.pub

@@ -1 +0,0 @@
-untmMfW2W4OiMgG/6nAysoivXtDh7cZ9/rxhgJ4OlC4=

m/ssd-lon/ssd-lon-4/hosts

@@ -1,24 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.16.0.3  ssd-lon-3
-10.16.0.4  ssd-lon-4 ssd-lon-ceph ssd-lon-k3s ceph k3s
-10.16.0.5  ssd-lon-5
-10.16.0.7  ssd-lon-7
-10.32.0.3  ssd-ams-3
-10.32.0.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s
-10.32.0.5  ssd-ams-5
-10.48.0.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.64.0.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.1.3  ssd-lon-3-0
-10.0.2.3  ssd-ams-3-0
-10.0.3.1  htz-fsn-1-0
-10.0.4.3  ssd-nyc-3-0

m/ssd-lon/ssd-lon-4/wg1.conf

@@ -1,23 +0,0 @@
-[Interface]
-# Name: ssd-lon-4-1
-Address = 10.16.0.4
-PrivateKey = wE05rSTPSlX9CUdyglpRsNqMVdh8bZSvmUlalGXArEE=
-ListenPort = 51810
-
-[Peer]
-# Name: ssd-lon-3-1
-PublicKey = untmMfW2W4OiMgG/6nAysoivXtDh7cZ9/rxhgJ4OlC4=
-Endpoint = ssd-lon-3.m.jpi.cloud:51810
-AllowedIPs = 10.16.0.3/32, 10.32.0.0/12, 10.48.0.0/12, 10.64.0.0/12, 10.0.1.3/32, 10.0.2.3/32, 10.0.3.1/32, 10.0.4.3/32
-
-[Peer]
-# Name: ssd-lon-5-1
-PublicKey = 9cUNKM8TPbD8BRjV7TG9/BuTq+2JO8KyrPCx69KW+Bk=
-Endpoint = ssd-lon-5.m.jpi.cloud:51810
-AllowedIPs = 10.16.0.5/32
-
-[Peer]
-# Name: ssd-lon-7-1
-PublicKey = XGVXDmxQajHpsgpzgrp+r/ZWxZUaodTpvGBJuLlZ0n4=
-Endpoint = ssd-lon-7.m.jpi.cloud:51810
-AllowedIPs = 10.16.0.7/32

m/ssd-lon/ssd-lon-4/wg1.key

@@ -1 +0,0 @@
-wE05rSTPSlX9CUdyglpRsNqMVdh8bZSvmUlalGXArEE=

m/ssd-lon/ssd-lon-4/wg1.pub

@@ -1 +0,0 @@
-f7AcZy4H2qfi7BRtRA82VdJAqc+IXU90k88GKBp9piM=

m/ssd-lon/ssd-lon-5/hosts

@@ -1,24 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.16.0.3  ssd-lon-3
-10.16.0.4  ssd-lon-4 ssd-lon-ceph ssd-lon-k3s ceph k3s
-10.16.0.5  ssd-lon-5
-10.16.0.7  ssd-lon-7
-10.32.0.3  ssd-ams-3
-10.32.0.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s
-10.32.0.5  ssd-ams-5
-10.48.0.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.64.0.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.1.3  ssd-lon-3-0
-10.0.2.3  ssd-ams-3-0
-10.0.3.1  htz-fsn-1-0
-10.0.4.3  ssd-nyc-3-0

m/ssd-lon/ssd-lon-5/wg1.conf

@@ -1,23 +0,0 @@
-[Interface]
-# Name: ssd-lon-5-1
-Address = 10.16.0.5
-PrivateKey = oMLrZ8ZmNeWrVroGTh9lx9cJC1enWCF5VfIkv8t+jmk=
-ListenPort = 51810
-
-[Peer]
-# Name: ssd-lon-3-1
-PublicKey = untmMfW2W4OiMgG/6nAysoivXtDh7cZ9/rxhgJ4OlC4=
-Endpoint = ssd-lon-3.m.jpi.cloud:51810
-AllowedIPs = 10.16.0.3/32, 10.32.0.0/12, 10.48.0.0/12, 10.64.0.0/12, 10.0.1.3/32, 10.0.2.3/32, 10.0.3.1/32, 10.0.4.3/32
-
-[Peer]
-# Name: ssd-lon-4-1
-PublicKey = f7AcZy4H2qfi7BRtRA82VdJAqc+IXU90k88GKBp9piM=
-Endpoint = ssd-lon-4.m.jpi.cloud:51810
-AllowedIPs = 10.16.0.4/32
-
-[Peer]
-# Name: ssd-lon-7-1
-PublicKey = XGVXDmxQajHpsgpzgrp+r/ZWxZUaodTpvGBJuLlZ0n4=
-Endpoint = ssd-lon-7.m.jpi.cloud:51810
-AllowedIPs = 10.16.0.7/32

m/ssd-lon/ssd-lon-5/wg1.key

@@ -1 +0,0 @@
-oMLrZ8ZmNeWrVroGTh9lx9cJC1enWCF5VfIkv8t+jmk=

m/ssd-lon/ssd-lon-5/wg1.pub

@@ -1 +0,0 @@
-9cUNKM8TPbD8BRjV7TG9/BuTq+2JO8KyrPCx69KW+Bk=

m/ssd-lon/ssd-lon-7/hosts

@@ -1,24 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.16.0.3  ssd-lon-3
-10.16.0.4  ssd-lon-4 ssd-lon-ceph ssd-lon-k3s ceph k3s
-10.16.0.5  ssd-lon-5
-10.16.0.7  ssd-lon-7
-10.32.0.3  ssd-ams-3
-10.32.0.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s
-10.32.0.5  ssd-ams-5
-10.48.0.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.64.0.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s
-
-10.0.1.3  ssd-lon-3-0
-10.0.2.3  ssd-ams-3-0
-10.0.3.1  htz-fsn-1-0
-10.0.4.3  ssd-nyc-3-0

m/ssd-lon/ssd-lon-7/wg1.conf

@@ -1,23 +0,0 @@
-[Interface]
-# Name: ssd-lon-7-1
-Address = 10.16.0.7
-PrivateKey = iN4Rc3J36APlkIP/ksSpHIwAuxC/ehYLwGQ5va1AhG8=
-ListenPort = 51810
-
-[Peer]
-# Name: ssd-lon-3-1
-PublicKey = untmMfW2W4OiMgG/6nAysoivXtDh7cZ9/rxhgJ4OlC4=
-Endpoint = ssd-lon-3.m.jpi.cloud:51810
-AllowedIPs = 10.16.0.3/32, 10.32.0.0/12, 10.48.0.0/12, 10.64.0.0/12, 10.0.1.3/32, 10.0.2.3/32, 10.0.3.1/32, 10.0.4.3/32
-
-[Peer]
-# Name: ssd-lon-4-1
-PublicKey = f7AcZy4H2qfi7BRtRA82VdJAqc+IXU90k88GKBp9piM=
-Endpoint = ssd-lon-4.m.jpi.cloud:51810
-AllowedIPs = 10.16.0.4/32
-
-[Peer]
-# Name: ssd-lon-5-1
-PublicKey = 9cUNKM8TPbD8BRjV7TG9/BuTq+2JO8KyrPCx69KW+Bk=
-Endpoint = ssd-lon-5.m.jpi.cloud:51810
-AllowedIPs = 10.16.0.5/32

m/ssd-lon/ssd-lon-7/wg1.key

@@ -1 +0,0 @@
-iN4Rc3J36APlkIP/ksSpHIwAuxC/ehYLwGQ5va1AhG8=

m/ssd-lon/ssd-lon-7/wg1.pub

@@ -1 +0,0 @@
-XGVXDmxQajHpsgpzgrp+r/ZWxZUaodTpvGBJuLlZ0n4=

m/ssd-nyc/regions

@@ -1 +0,0 @@
-us

m/ssd-nyc/ssd-nyc-3/hosts

@@ -1,24 +0,0 @@
-127.0.0.1 localhost
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-
-10.16.0.3  ssd-lon-3
-10.16.0.4  ssd-lon-4 ssd-lon-ceph ssd-lon-k3s
-10.16.0.5  ssd-lon-5
-10.16.0.7  ssd-lon-7
-10.32.0.3  ssd-ams-3
-10.32.0.4  ssd-ams-4 ssd-ams-ceph ssd-ams-k3s
-10.32.0.5  ssd-ams-5
-10.48.0.1  htz-fsn-1 htz-fsn-ceph htz-fsn-k3s
-10.64.0.3  ssd-nyc-3 ssd-nyc-ceph ssd-nyc-k3s ceph k3s
-
-10.0.1.3  ssd-lon-3-0
-10.0.2.3  ssd-ams-3-0
-10.0.3.1  htz-fsn-1-0
-10.0.4.3  ssd-nyc-3-0

m/ssd-nyc/ssd-nyc-3/region

@@ -1 +0,0 @@
-none

m/ssd-nyc/ssd-nyc-3/wg0.conf

@@ -1,23 +0,0 @@
-[Interface]
-# Name: ssd-nyc-3-0
-Address = 10.0.4.3
-PrivateKey = YNDxj+QSO3p5pXw9h7lBx0cLM0kJDv3v7BYLfc8TR3I=
-ListenPort = 51800
-
-[Peer]
-# Name: ssd-lon-3-0
-PublicKey = aDXNwapVjufcuQKfBN+waJObe1TaeeaSNl1suA0u+00=
-Endpoint = ssd-lon-3.m.jpi.cloud:51800
-AllowedIPs = 10.16.0.0/12, 10.0.1.3/32
-
-[Peer]
-# Name: ssd-ams-3-0
-PublicKey = y/Gkid2Mjxo1WO9Zi7mh+DETNYKT/AAc3K3bvr9xp3c=
-Endpoint = ssd-ams-3.m.jpi.cloud:51800
-AllowedIPs = 10.32.0.0/12, 10.0.2.3/32
-
-[Peer]
-# Name: htz-fsn-1-0
-PublicKey = K9LYog8vtRFN4nW6dJWMQ9trmRrYuLpbu/Ze5kIiBGw=
-Endpoint = htz-fsn-1.m.jpi.cloud:51800
-AllowedIPs = 10.48.0.0/12, 10.0.3.1/32

m/ssd-nyc/ssd-nyc-3/wg0.key

@@ -1 +0,0 @@
-YNDxj+QSO3p5pXw9h7lBx0cLM0kJDv3v7BYLfc8TR3I=

m/ssd-nyc/ssd-nyc-3/wg0.pub

@@ -1 +0,0 @@
-1UFgleUufTszPM1voIcwVhd0DpYZ1HwV05U6p3IS2DE=

m/ssd-nyc/ssd-nyc-3/wg1.conf

@@ -1,5 +0,0 @@
-[Interface]
-# Name: ssd-nyc-3-1
-Address = 10.64.0.3
-PrivateKey = APXGKqOxx1gOr587FSN3O3gRGpkGgSjt6zGlTu49UlU=
-ListenPort = 51810

m/ssd-nyc/ssd-nyc-3/wg1.key

@@ -1 +0,0 @@
-APXGKqOxx1gOr587FSN3O3gRGpkGgSjt6zGlTu49UlU=

m/ssd-nyc/ssd-nyc-3/wg1.pub

@@ -1 +0,0 @@
-av8ni/9ZUyozabzqTjIy1sOnSJuQ9p63Tu9ECVmHB2I=

pkg/cluster/cluster_scan.go

@@ -4,7 +4,6 @@ import (
 	"io/fs"
 	"path"
 	"sort"
-	"strings"
 
 	"darvaza.org/core"
 )
@@ -13,10 +12,6 @@ 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 {
@@ -191,8 +186,6 @@ 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:
@@ -225,32 +218,6 @@ 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,

pkg/cluster/env.go

@@ -85,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 buf bytes.Buffer
+	var s string
 
-	for _, v := range value {
-		if buf.Len() > 0 {
-			_, _ = fmt.Fprint(&buf, " ")
+	if n := len(value); n > 0 {
+		var buf bytes.Buffer
+
+		for i, v := range value {
+			if i != 0 {
+				_, _ = fmt.Fprint(&buf, " ")
+			}
+			_, _ = fmt.Fprintf(&buf, "%v", v)
 		}
-		_, _ = fmt.Fprintf(&buf, "%v", v)
+
+		s = buf.String()
 	}
 
-	m.writeEnvVar(w, buf.String(), name, args...)
-}
-
-func (m *Env) writeEnvVarStrings(w io.Writer, value []string, name string, args ...any) {
-	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...)
+	m.writeEnvVar(w, s, name, args...)
 }
 
 func (m *Env) writeEnvVar(w io.Writer, value string, name string, args ...any) {

pkg/cluster/regions.go

@@ -8,21 +8,14 @@ import (
 var (
 	_ MachineIterator = (*Region)(nil)
 	_ ZoneIterator    = (*Region)(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
 	zones []*Zone
 
 	Name    string
-	Cluster *string  `json:",omitempty" yaml:",omitempty"`
 	Regions []string `json:",omitempty" yaml:",omitempty"`
 }
 
@@ -113,26 +106,6 @@ 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,11 +183,6 @@ func (z *Zone) SyncRegions() error {
 			} else {
 				err = p.WriteStringFile("none\n", "region")
 			}
-
-			if err == nil {
-				err = p.RemoveFile(RegionClusterTokenFileName)
-			}
-
 			return err != nil
 		})
 	}
@@ -223,7 +191,7 @@ func (z *Zone) SyncRegions() error {
 }
 
 func (z *Zone) syncZoneRegions() error {
-	name := filepath.Join(z.Name, ZoneRegionsFileName)
+	name := filepath.Join(z.Name, "regions")
 
 	if len(z.Regions) > 0 {
 		var buf bytes.Buffer
@@ -242,25 +210,9 @@ 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
-	}
+	name := filepath.Join(r.Name, "regions")
 
-	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 {
-		err = r.m.RemoveFile(name)
-	} else if err = r.mkdir(); err == nil {
+	if len(r.Regions) > 0 {
 		var buf bytes.Buffer
 
 		for _, s := range r.Regions {
@@ -268,29 +220,12 @@ func (r *Region) syncRegionsFile() error {
 			_, _ = buf.WriteRune('\n')
 		}
 
-		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')
+		if err := r.m.MkdirAll(r.Name); err != nil {
+			return err
 		}
 
-		err = r.m.WriteStringFile(buf.String(), name)
+		return r.m.WriteStringFile(buf.String(), name)
 	}
 
-	return err
+	return r.m.RemoveFile(name)
 }