From 1ea1fe366235b17fde86c068fc15cf5666b639f7 Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Tue, 4 Apr 2023 21:07:48 +0200 Subject: Update k3s-master playbook --- playbooks.d/k3s-master/etc/defaults | 9 ++------- playbooks.d/k3s-master/playbook.bash | 13 ++++++++++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/playbooks.d/k3s-master/etc/defaults b/playbooks.d/k3s-master/etc/defaults index eab4aee..5a09990 100644 --- a/playbooks.d/k3s-master/etc/defaults +++ b/playbooks.d/k3s-master/etc/defaults @@ -1,8 +1,3 @@ -pkg.k3s=k3s pkg.helm=helm - -k3s.domain=cluster.local -k3s.network.cidr.pods=172.19.0.0/16 -k3s.network.cidr.svcs=172.20.0.0/16 -k3s.network.service.dns=172.20.0.53 -k3s.flux.repo.branch=master +pkg.k3s=k3s +pkg.kubectl=kubectl diff --git a/playbooks.d/k3s-master/playbook.bash b/playbooks.d/k3s-master/playbook.bash index cc6cd29..d15724b 100644 --- a/playbooks.d/k3s-master/playbook.bash +++ b/playbooks.d/k3s-master/playbook.bash @@ -1,7 +1,18 @@ #!/usr/bin/env bash playbook_add() { - # TODO: Install kubectl, helm! + info "$BASHTARD_PLAYBOOK" "Installing additional programs" + pkg install kubectl helm + + info "$BASHTARD_PLAYBOOK" "Writing config.yaml for k3s" + mkdir -pv -- /etc/rancher/k3s + cat <<-EOF > /etc/rancher/k3s/config.yaml + node-name: "${BASHTARD_PLATFORM[fqdn]}" + cluster-cidr: 172.19.0.0/16 + service-cidr: 172.20.0.0/16 + cluster-domain: cluster.local + EOF + info "$BASHTARD_PLAYBOOK" "Installing k3s" curl -sfL https://get.k3s.io | sh - # I hate this -- cgit v1.1