summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2022-07-28 08:22:12 +0200
committerPatrick Spek <p.spek@tyil.nl>2022-07-28 08:22:12 +0200
commit4eccce0b291bbdae4653c77cb9abc04868e8cfce (patch)
tree567b8f27d33d8304c2a3ceac3b397b30ec34b8c6
parentfe27698b714906cf5064867e7c416da8a5e94d16 (diff)
Update default path for flux
-rw-r--r--defaults1
-rw-r--r--playbooks.d/k3s-master/playbook.bash3
2 files changed, 1 insertions, 3 deletions
diff --git a/defaults b/defaults
index 51c8f66..787c7ed 100644
--- a/defaults
+++ b/defaults
@@ -5,4 +5,3 @@ 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
k3s.flux.repo.url=ssh://tyil@10.57.100.7/home/tyil/.local/git/tyilnet
-k3s.flux.repo.path=playbooks.d/k3s-master/share/manifests
diff --git a/playbooks.d/k3s-master/playbook.bash b/playbooks.d/k3s-master/playbook.bash
index 8985132..0671790 100644
--- a/playbooks.d/k3s-master/playbook.bash
+++ b/playbooks.d/k3s-master/playbook.bash
@@ -29,8 +29,7 @@ playbook_add() {
--branch="$(config "k3s.flux.repo.branch")" \
--cluster-domain="$(config "k3s.domain")" \
--kubeconfig=/etc/rancher/k3s/k3s.yaml \
- --path="$(config "k3s.flux.repo.path")" \
- --private-key-file=$HOME/.ssh/id.d/root@edephas-ed25519 \
+ --path="$(config "k3s.flux.repo.path" "playbooks.d/$BASHTARD_PLAYBOOK/share/manifests/clusters/${BASHTARD_PLATFORM[fqdn]}")" \
--silent \
--url="$(config "k3s.flux.repo.url")"