diff options
| -rw-r--r-- | defaults | 3 | ||||
| -rw-r--r-- | playbooks.d/k3s-master/etc/defaults | 2 | ||||
| -rw-r--r-- | playbooks.d/k3s-master/playbook.bash | 33 |
3 files changed, 22 insertions, 16 deletions
@@ -1,7 +1,8 @@ bashtard.backup.elements.0=filesystem bashtard.backup.fs.paths.0=/etc bashtard.backup.repositories.0=backup@edephas:{fqdn} -k3s.domain=k3s.tyil.nl 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/etc/defaults b/playbooks.d/k3s-master/etc/defaults index c73f66b..00fbe93 100644 --- a/playbooks.d/k3s-master/etc/defaults +++ b/playbooks.d/k3s-master/etc/defaults @@ -5,3 +5,5 @@ k3s.domain=cluster.local k3s.network.cidr.pods=10.42.0.0/16 k3s.network.cidr.svcs=10.43.0.0/16 k3s.network.service.dns=10.43.0.10 +k3s.flux.repo.branch=master +k3s.flux.repo.path=manifests diff --git a/playbooks.d/k3s-master/playbook.bash b/playbooks.d/k3s-master/playbook.bash index 69a2e58..f759e74 100644 --- a/playbooks.d/k3s-master/playbook.bash +++ b/playbooks.d/k3s-master/playbook.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash playbook_add() { - pkg install helm k3s + pkg install k3s info "$BASHTARD_PLAYBOOK" "Writing config.yaml for k3s" mkdir -pv -- /etc/rancher/k3s @@ -19,20 +19,23 @@ playbook_add() { info "$BASHTARD_PLAYBOOK" "Installing k3s" curl -sfL https://get.k3s.io | sh - # I hate this - - export KUBECONFIG=/etc/rancher/k3s/k3s.yaml - export HELM_KUBECONTEXT=default - - info "$BASHTARD_PLAYBOOK" "Installing ArgoCD on k3s" - k3s kubectl create namespace argocd - helm repo add argo https://argoproj.github.io/argo-helm - helm install \ - -n argocd \ - -f "$BASHTARD_ETCDIR/playbooks.d/$BASHTARD_PLAYBOOK/share/argocd/values.yaml" \ - argocd argo/argo-cd - - info "$BASHTARD_PLAYBOOK" "Waiting for argocd-server deployment to be ready" - { grep -q -m 1 "argocd-server[[:space:]]\+1/1"; kill $!; } < <(k3s kubectl get deployment -n argocd -w) + curl -L https://github.com/fluxcd/flux2/releases/download/v0.31.5/flux_0.31.5_linux_amd64.tar.gz | tar xzf - -C /usr/local/bin + + notice "$BASHTARD_PLAYBOOK" "Waiting for node to become available" + { 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 \ + --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 \ + --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" |