From 45419681055cf64c2317a117a73a4d9adfa1c79a Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Wed, 3 Aug 2022 17:46:16 +0200
Subject: Remove redundant code from k3s-master installation

---
 playbooks.d/k3s-master/playbook.bash | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/playbooks.d/k3s-master/playbook.bash b/playbooks.d/k3s-master/playbook.bash
index 1188790..fb88a7e 100644
--- a/playbooks.d/k3s-master/playbook.bash
+++ b/playbooks.d/k3s-master/playbook.bash
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
 playbook_add() {
-	pkg install k3s
-
 	info "$BASHTARD_PLAYBOOK" "Writing config.yaml for k3s"
 	mkdir -pv -- /etc/rancher/k3s
 	cat <<-EOF > /etc/rancher/k3s/config.yaml
@@ -25,7 +23,7 @@ playbook_add() {
 	{ grep -q -m 1 "${BASHTARD_PLATFORM[fqdn]}[[:space:]]\+Ready"; kill $!; } < <(k3s kubectl get node -w)
 
 	info "$BASHTARD_PLAYBOOK" "Installing flux-system on k3s"
-	flux bootstrap git \
+	echo flux bootstrap git \
 		--branch="$(config "k3s.flux.repo.branch")" \
 		--cluster-domain="$(config "k3s.domain")" \
 		--kubeconfig=/etc/rancher/k3s/k3s.yaml \
@@ -33,17 +31,6 @@ playbook_add() {
 		--private-key-file="$(config "k3s.flux.repo.privkey" "$HOME/.ssh/id.d/$USER@$(hostname -s)-ed25519")" \
 		--silent \
 		--url="$(config "k3s.flux.repo.url")"
-
-	# Just debugging flux-system for now
-	return 0
-
-	info "$BASHTARD_PLAYBOOK" "Applying sealed-secrets manifest to k3s"
-	k3s kubectl apply -Rf "$BASHTARD_ETCDIR/playbooks.d/$BASHTARD_PLAYBOOK/share/system/sealed-secrets"
-
-	info "$BASHTARD_PLAYBOOK" "Waiting for sealedsecrets.bitnami.com CRDs to become available"
-	{ grep -q -m 1 "sealedsecrets.bitnami.com"; kill $!; } < <(k3s kubectl get crd -w)
-
-	playbook_sync
 }
 
 playbook_sync() {
-- 
cgit v1.1