From 51212b01cc27202ba23fbcf3dd5e2684b9f8f90e Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Wed, 3 Apr 2024 13:21:28 +0200 Subject: Update variables for k3s --- defaults | 22 ++++++++++------------ hosts.d/oolah.tyil.net | 9 +++++---- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/defaults b/defaults index 50fdd15..4fe8e6a 100644 --- a/defaults +++ b/defaults @@ -10,20 +10,18 @@ dns.upstream.4=2001:470:71:6dc::53 etc-nixos.path=/etc/nixos etc-portage.path=/etc/portage k3s-master.cluster-domain=k3s.tyil.nl -k3s-master.helm.apps.certmanager.chart=jetstack/cert-manager -k3s-master.helm.apps.certmanager.namespace=base-system -k3s-master.helm.apps.certmanager.values=certmanager.yaml -k3s-master.helm.repos.jetstack.url=https://charts.jetstack.io k3s-master.service-node-port-min=1025 +k3s-master.cluster-cidr=fd00:8::0/48,172.28.0.0/16 +k3s-master.service-cidr=fd00:5::0/108,172.25.0.0/16 +k3s-node.bind-address&=vpn-wireguard.ipv6 k3s-node.cluster-domain=k3s.tyil.nl -k3s-node.entry.host=10.57.101.1 -k3s-node.service-node-port-min=1025 -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.master.address=k8s.tyil.nl -k8s-node.node-ip&=vpn-wireguard.ipv6 +k3s-node.entry.host=[fd68:1058:1992:3381:0:1:1:1] +k3s-node.external-ip&=k3s-node.internal-ip +k3s-node.role=agent +k3s-node.service-node-port-min&=k3s-master.service-node-port-min +k3s-node.cluster-cidr&=k3s-master.cluster-cidr +k3s-node.service-cidr&=k3s-master.service-cidr +k3s-node.cluster-domain&=k3s-master.cluster-domain nftables.input.icmp.ipv4.policy=accept nftables.input.icmp.ipv4.rate=2/second nftables.input.icmp.ipv6.policy=accept diff --git a/hosts.d/oolah.tyil.net b/hosts.d/oolah.tyil.net index be29722..11afa9f 100644 --- a/hosts.d/oolah.tyil.net +++ b/hosts.d/oolah.tyil.net @@ -1,10 +1,11 @@ bashtard.ssh.host=10.57.101.1 -k3s-master.manifest-prefix=tyilnet -k3s-node.role=server -k3s-node.entry.host=10.57.101.20 +k3s-master.bind-address&=k3s-node.bind-address +k3s-master.internal-ip&=k3s-node.internal-ip +k3s-node.bind-address&=vpn-wireguard.ipv6 +k3s-node.internal-ip=fd68:1058:1992:3381:0:1:3317:1,10.58.1.4 meta.provider=self vpn-tinc.ipv4=10.57.101.1 vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:3317:1 vpn-wireguard.endpoint=2a10:3781:2453:1:7aaf:8ff:fe7a:9ba8 -vpn-wireguard.ipv4=10.57.1.4 +vpn-wireguard.ipv4=10.58.1.4 vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:3317:1 -- cgit v1.1