From c68cf1d4830eba09feb2d10913ed31a1f8ae62fe Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Mon, 25 Jul 2022 15:50:19 +0200 Subject: Make the playbook more configurable --- defaults | 4 ++++ playbooks.d/k3s/etc/defaults | 8 ++++++++ playbooks.d/k3s/playbook.bash | 12 ++++++------ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 playbooks.d/k3s/etc/defaults diff --git a/defaults b/defaults index a283f56..d225612 100644 --- a/defaults +++ b/defaults @@ -1,3 +1,7 @@ bashtard.backup.elements.0=filesystem bashtard.backup.fs.paths.0=/etc bashtard.backup.repositories.0=backup@edephas:{fqdn} +k3s.domain=k3s.tyil.nl +k3s.network.cidr.pods=10.57.40.0/20 +k3s.network.cidr.svcs=10.57.48.0/20 +k3s.network.service.dns=10.57.48.53 diff --git a/playbooks.d/k3s/etc/defaults b/playbooks.d/k3s/etc/defaults new file mode 100644 index 0000000..c1f075d --- /dev/null +++ b/playbooks.d/k3s/etc/defaults @@ -0,0 +1,8 @@ +pkg.k3s=k3s + +k3s.domain=cluster.local +k3s.network.bind=127.0.0.1 +k3s.network.cidr.pods=10.42.0.0/16 +k3s.network.cidr.svcs=10.43.0.0/16 +k3s.network.ip=127.0.0.1 +k3s.network.service.dns=10.43.0.10 diff --git a/playbooks.d/k3s/playbook.bash b/playbooks.d/k3s/playbook.bash index b9216c7..60d6eba 100644 --- a/playbooks.d/k3s/playbook.bash +++ b/playbooks.d/k3s/playbook.bash @@ -6,12 +6,12 @@ playbook_add() { mkdir -pv -- /etc/rancher/k3s cat <<-EOF > /etc/rancher/k3s/config.yaml node-name: ${BASHTARD_PLATFORM[fqdn]} - node-ip: $(config "vpn.ipv4") - bind-address: $(config "vpn.ipv4") - cluster-cidr: 10.57.40.0/20 - service-cidr: 10.57.48.0/20 - cluster-dns: 10.57.48.53 - cluster-domain: k3s.tyil.nl + node-ip: $(config "k3s.network.ip" "$(config "vpn.ipv4")") + bind-address: $(config "k3s.network.bind" "$(config "vpn.ipv4")") + cluster-cidr: $(config "k3s.network.cidr.pods") + service-cidr: $(config "k3s.network.cidr.svcs") + cluster-dns: $(config "k3s.network.service.dns") + cluster-domain: $(config "k3s.domain") disable: - traefik EOF -- cgit v1.1