Add autofetching of k3s token

1 files changed, 43 insertions, 19 deletions

diff --git a/playbooks.d/k3s-node/playbook.bash b/playbooks.d/k3s-node/playbook.bash
index c2228ae..a12b45d 100644
--- a/playbooks.d/k3s-node/playbook.bash
+++ b/playbooks.d/k3s-node/playbook.bash
@@ -1,23 +1,46 @@
 #!/usr/bin/env bash
 
 BASHTARD_PLAYBOOK_VARS[$BASHTARD_PLAYBOOK.entry.host]="required"
-BASHTARD_PLAYBOOK_VARS[$BASHTARD_PLAYBOOK.entry.token]="required"
 
 playbook_add() {
+	local host
 	local role
+	local token
 
+	host="$(config "$BASHTARD_PLAYBOOK.entry.host")"
 	role="$(config "$BASHTARD_PLAYBOOK.role" "agent")"
+	token="$(config "$BASHTARD_PLAYBOOK.entry.token" "")"
 
 	pkg install curl
 
-	info "$BASHTARD_PLAYBOOK" "Writing config.yaml for k3s"
+	# If token is not supplied manually, attempt to fetch it from the entry
+	# host over ssh
+	if [[ -z "$token" ]]
+	then
+		# Dealing with an IPv6 address, strip away the brackets
+		if [[ "${host:0:1}" == "[" && "${host: -1}" == "]" ]]
+		then
+			host="${host:1:-1}"
+		fi
+
+		info "$BASHTARD_PLAYBOOK/add" "Attempting to fetch token from $host"
+		token="$(ssh "$host" -- cat /var/lib/rancher/k3s/server/token)"
+	fi
+
+	if [[ -z "$token" ]]
+	then
+		emerg "$BASHTARD_PLAYBOOK/add" "No entry token found, set one with bashtard var -s $BASHTARD_PLAYBOOK.entry.token <value>"
+		return 1
+	fi
+
+	info "$BASHTARD_PLAYBOOK/add" "Writing config.yaml for k3s"
 	mkdir -pv -- /etc/rancher/k3s
 	{
 		cat <<-EOF
 		node-name: "${BASHTARD_PLATFORM[fqdn]}"
 		node-ip: "$(config "$BASHTARD_PLAYBOOK.internal-ip" "127.0.0.1")"
 		server: "https://$(config "$BASHTARD_PLAYBOOK.entry.host"):$(config "$BASHTARD_PLAYBOOK.entry.port" "6443")"
-		token: "$(config "$BASHTARD_PLAYBOOK.entry.token")"
+		token: "$token"
 		EOF
 
 		if [[ -n "$(config_subkeys "$BASHTARD_PLAYBOOK.flannel.interfaces")" ]]
@@ -26,30 +49,31 @@ playbook_add() {
 
 			while read -r iface
 			do
-				printf -- "- %s\n" "$(config "$BASHTARD_PLAYBOOK.flannel.interfaces.$iface")"
+				printf -- "- \"%s\"\n" "$(config "$BASHTARD_PLAYBOOK.flannel.interfaces.$iface")"
 			done < <( config_subkeys "$BASHTARD_PLAYBOOK.flannel.interfaces" )
 		fi
 
 		if [[ -n "$(config "$BASHTARD_PLAYBOOK.external-ip" "")" ]]
 		then
-			printf "%s: %s\n" "node-external-ip" "$(config "$BASHTARD_PLAYBOOK.external-ip" "")"
+			printf "%s: \"%s\"\n" "node-external-ip" "$(config "$BASHTARD_PLAYBOOK.external-ip" "")"
 		fi
-	} > "$(config "fs.etcdir")/rancher/k3s/config.yaml"
 
-	if [[ "$role" == "server" ]]
-	then
-		cat <<-EOF >> /etc/rancher/k3s/config.yaml
-		cluster-cidr: "$(config "$BASHTARD_PLAYBOOK.cluster-cidr" "172.19.0.0/16")"
-		cluster-domain: "$(config "$BASHTARD_PLAYBOOK.cluster-domain" "cluster.local")"
-		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")"
-		flannel-ipv6-masq: true
-		disable:
-		- traefik
-		EOF
-	fi
+		if [[ "$role" == "server" ]]
+		then
+			info "$BASHTARD_PLAYBOOK/add" "Node is a server, adding master configuration"
+			cat <<-EOF >> /etc/rancher/k3s/config.yaml
+			cluster-cidr: "$(config "$BASHTARD_PLAYBOOK.cluster-cidr" "172.19.0.0/16")"
+			cluster-domain: "$(config "$BASHTARD_PLAYBOOK.cluster-domain" "cluster.local")"
+			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")"
+			flannel-ipv6-masq: true
+			disable:
+			- traefik
+			EOF
+		fi
+	} > "$(config "fs.etcdir")/rancher/k3s/config.yaml"
 
-	info "$BASHTARD_PLAYBOOK" "Installing k3s"
+	info "$BASHTARD_PLAYBOOK/add" "Installing k3s"
 	curl -sfL https://get.k3s.io | sh -s - "$role"
 }