From adb182b14b81997819fef19b56b8623634b3fb9f Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Tue, 1 Aug 2023 13:16:48 +0200 Subject: Add nouki as control-plane node to oolah --- playbooks.d/k3s-node/playbook.bash | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'playbooks.d') diff --git a/playbooks.d/k3s-node/playbook.bash b/playbooks.d/k3s-node/playbook.bash index e4fc48a..6d4fcc5 100644 --- a/playbooks.d/k3s-node/playbook.bash +++ b/playbooks.d/k3s-node/playbook.bash @@ -9,20 +9,18 @@ playbook_add() { 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]}" - node-ip: "$(config "$BASHTARD_PLAYBOOK.node-ip" "$(config "bashtard.ssh.host")")" cluster-cidr: "$(config "$BASHTARD_PLAYBOOK.cluster-cidr" "172.19.0.0/16")" - service-cidr: "$(config "$BASHTARD_PLAYBOOK.service-cidr" "172.20.0.0/16")" cluster-domain: "$(config "$BASHTARD_PLAYBOOK.cluster-domain" "cluster.local")" + node-ip: "$(config "$BASHTARD_PLAYBOOK.node-ip" "$(config "bashtard.ssh.host")")" + node-name: "${BASHTARD_PLATFORM[fqdn]}" + server: "https://$(config "$BASHTARD_PLAYBOOK.entry.host"):$(config "$BASHTARD_PLAYBOOK.entry.port" "6443")" + service-cidr: "$(config "$BASHTARD_PLAYBOOK.service-cidr" "172.20.0.0/16")" service-node-port-range: "$(config "$BASHTARD_PLAYBOOK.service-node-port-min" "30000")-$(config "$BASHTARD_PLAYBOOK.service-node-port-max" "32767")" + token: "$(config "$BASHTARD_PLAYBOOK.entry.token")" EOF info "$BASHTARD_PLAYBOOK" "Installing k3s" - curl -sfL https://get.k3s.io \ - | K3S_TOKEN_SECRET="$(config "$BASHTARD_PLAYBOOK.entry.token")" \ - sh -s - \ - "$(config "$BASHTARD_PLAYBOOK.role" "agent")" \ - https://"$(config "$BASHTARD_PLAYBOOK.entry.host"):$(config "$BASHTARD_PLAYBOOK.entry.port)" + curl -sfL https://get.k3s.io | sh -s - "$(config "$BASHTARD_PLAYBOOK.role" "agent")" notice "$BASHTARD_PLAYBOOK" "Waiting for node to become available" { grep -q -m 1 "${BASHTARD_PLATFORM[fqdn]}[[:space:]]\+Ready"; kill $!; } < <(k3s kubectl get node -w) -- cgit v1.1