summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2024-03-05 16:23:15 +0100
committerPatrick Spek <p.spek@tyil.nl>2024-03-05 16:26:26 +0100
commit435565b286373e72fc91629216fb6600648e28c9 (patch)
tree22caaf379eb0f8c0e2f6437de7d9be973ebaae75
parent7b46c788af44a03692ac995de0b74281b9b7aaf4 (diff)
Update IPs with reference variables
-rw-r--r--defaults1
-rw-r--r--hosts.d/jaomox.tyil.net3
-rw-r--r--hosts.d/mieshu.tyil.net3
-rw-r--r--hosts.d/qohrei.tyil.net5
-rw-r--r--hosts.d/ricui.tyil.net4
-rw-r--r--hosts.d/toki.tyil.net3
6 files changed, 10 insertions, 9 deletions
diff --git a/defaults b/defaults
index 60d6388..00dc559 100644
--- a/defaults
+++ b/defaults
@@ -22,6 +22,7 @@ k8s-master.flags.control-plane-endpoint=k8s.tyil.nl
k8s-master.flags.pod-network-cidr=fd68:1058:1992:8888::0/64
k8s-master.flags.service-cidr=fd68:1058:1992:3381::80:0/108
k8s-master.flags.service-dns-domain=k8s.tyil.nl
+k8s-node.node-ip&=vpn-wireguard.ipv6
nftables.input.icmp.ipv4.policy=accept
nftables.input.icmp.ipv4.rate=2/second
nftables.input.icmp.ipv6.policy=accept
diff --git a/hosts.d/jaomox.tyil.net b/hosts.d/jaomox.tyil.net
index e11c9a0..ca627d9 100644
--- a/hosts.d/jaomox.tyil.net
+++ b/hosts.d/jaomox.tyil.net
@@ -25,4 +25,5 @@ seaweedfs-volume.volumes.0.port=8080
vpn-tinc.ipv4=10.57.21.1
vpn-tinc.ipv6=fd68:1057:1992:3381:0:3:3:1
vpn-wireguard.endpoint=163.172.218.246
-vpn-wireguard.ip=fd68:1058:1992:3381:0:3:3:1
+vpn-wireguard.ipv4=10.58.3.1
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:3:3:1
diff --git a/hosts.d/mieshu.tyil.net b/hosts.d/mieshu.tyil.net
index 3e2a0fa..88f4a11 100644
--- a/hosts.d/mieshu.tyil.net
+++ b/hosts.d/mieshu.tyil.net
@@ -31,6 +31,3 @@ nfs-server.exports./mnt/exports/invidious.fsid=97d3493c-1397-479f-bb8a-5c71833b9
nfs-server.exports./mnt/exports/prometheus.fsid=052f42b5-33c0-40b9-aa69-d05dc03a9fa1
vpn-tinc.ipv4=10.57.101.10
vpn-tinc.ipv6=fd68:1057:1992:3381:0:3317:3:1
-vpn-wireguard.endpoint=2a10:3781:2453:1:4950:47ce:f8db:1fed
-vpn-wireguard.ip=fd68:1058:1992:3381:0:3317:3:1
-vpn-wireguard.port=51820
diff --git a/hosts.d/qohrei.tyil.net b/hosts.d/qohrei.tyil.net
index ceca7d9..536b51f 100644
--- a/hosts.d/qohrei.tyil.net
+++ b/hosts.d/qohrei.tyil.net
@@ -1,4 +1,4 @@
-k8s-master.flags.apiserver-advertise-address=fd68:1058:1992:3381:0:1:1:1
+k8s-master.flags.apiserver-advertise-address&=vpn-wireguard.ipv6
meta.provider=hetzner
nftables.input.interfaces.cilium*.policy=accept
nftables.input.interfaces.lxc*.policy=accept
@@ -14,4 +14,5 @@ nftables.input.rules.kubelet.proto=tcp
vpn-tinc.ipv4=10.57.250.250
vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:1
vpn-wireguard.endpoint=2a01:4f9:c012:6273::1
-vpn-wireguard.ip=fd68:1058:1992:3381:0:1:1:1
+vpn-wireguard.ipv4=10.58.1.1
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:1
diff --git a/hosts.d/ricui.tyil.net b/hosts.d/ricui.tyil.net
index 4e09141..3100c45 100644
--- a/hosts.d/ricui.tyil.net
+++ b/hosts.d/ricui.tyil.net
@@ -7,5 +7,5 @@ nftables.input.rules.kubelet.proto=tcp
vpn-tinc.ipv4=10.57.20.7
vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:3
vpn-wireguard.endpoint=2a01:4f8:1c1b:67d7::1
-vpn-wireguard.ip=fd68:1058:1992:3381:0:1:1:3
-k8s-node.node-ip=fd68:1058:1992:3381:0:1:1:3
+vpn-wireguard.ipv4=10.58.1.3
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:3
diff --git a/hosts.d/toki.tyil.net b/hosts.d/toki.tyil.net
index 78d3bad..9473cf2 100644
--- a/hosts.d/toki.tyil.net
+++ b/hosts.d/toki.tyil.net
@@ -7,4 +7,5 @@ nftables.input.rules.kubelet.proto=tcp
vpn-tinc.ipv4=10.57.20.8
vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:4
vpn-wireguard.endpoint=2a01:4f8:c013:2945::1
-vpn-wireguard.ip=fd68:1058:1992:3381:0:1:1:4
+vpn-wireguard.ipv4=10.58.1.4
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:4