From 8faa97a8bb3c44c4c2b86da79c3dc12a315c171c Mon Sep 17 00:00:00 2001 From: jon brookes Date: Fri, 10 Oct 2025 13:33:11 +0100 Subject: [PATCH] feat: env INSTALL_LONGHORN Add Ansible playbooks for Longhorn, MetalLB, and Traefik installation conditional on presence of INSTALL_LONGHORN=true --- vagrant/dev/ubuntu/Vagrantfile | 6 +- .../dev/ubuntu/ansible/install_longhorn.yaml | 16 ++++ .../dev/ubuntu/ansible/install_metallb.yaml | 16 ++++ .../dev/ubuntu/ansible/install_traefik.yaml | 20 +++++ .../ubuntu/ansible/provision_workstation.sh | 82 ++++++++++++------- vagrant/dev/ubuntu/scripts/install_metallb.sh | 33 +++++--- 6 files changed, 129 insertions(+), 44 deletions(-) create mode 100644 vagrant/dev/ubuntu/ansible/install_longhorn.yaml create mode 100644 vagrant/dev/ubuntu/ansible/install_metallb.yaml create mode 100644 vagrant/dev/ubuntu/ansible/install_traefik.yaml diff --git a/vagrant/dev/ubuntu/Vagrantfile b/vagrant/dev/ubuntu/Vagrantfile index eee4a3e..39abb26 100644 --- a/vagrant/dev/ubuntu/Vagrantfile +++ b/vagrant/dev/ubuntu/Vagrantfile @@ -117,7 +117,11 @@ Vagrant.configure("2") do |config| vb.cpus = 1 end - ws.vm.provision "shell", path: "ansible/provision_workstation.sh" + ws.vm.provision "shell", + path: "ansible/provision_workstation.sh", + env: { + "INSTALL_LONGHORN" => ENV['INSTALL_LONGHORN'] || "false" + } end diff --git a/vagrant/dev/ubuntu/ansible/install_longhorn.yaml b/vagrant/dev/ubuntu/ansible/install_longhorn.yaml new file mode 100644 index 0000000..e303917 --- /dev/null +++ b/vagrant/dev/ubuntu/ansible/install_longhorn.yaml @@ -0,0 +1,16 @@ +--- +- name: Install longhorn using infctl + hosts: localhost + become: true + become_user: vagrant + serial: 1 # Ensure tasks are executed one host at a time + vars_files: + - vars.yaml + + tasks: + + - name: run infctl longhorn pipeline + ansible.builtin.command: > + bash -c 'cd /home/vagrant && LOG_FILE=/tmp/longhorn_log.txt LOG_FORMAT=basic infctl -f pipelines/vagrant-longhorn.json' + register: longhorn_result + ignore_errors: false diff --git a/vagrant/dev/ubuntu/ansible/install_metallb.yaml b/vagrant/dev/ubuntu/ansible/install_metallb.yaml new file mode 100644 index 0000000..2129d0c --- /dev/null +++ b/vagrant/dev/ubuntu/ansible/install_metallb.yaml @@ -0,0 +1,16 @@ +--- +- name: Install metallb using infctl + hosts: localhost + become: true + become_user: vagrant + serial: 1 # Ensure tasks are executed one host at a time + vars_files: + - vars.yaml + + tasks: + + - name: run ======== infctl metallb pipeline + ansible.builtin.command: > + bash -c 'cd /home/vagrant && LOG_FILE=/tmp/metallb_log.txt LOG_FORMAT=basic infctl -f ./pipelines/vagrant-metallb.json' + register: metallb_result + ignore_errors: false diff --git a/vagrant/dev/ubuntu/ansible/install_traefik.yaml b/vagrant/dev/ubuntu/ansible/install_traefik.yaml new file mode 100644 index 0000000..99f5656 --- /dev/null +++ b/vagrant/dev/ubuntu/ansible/install_traefik.yaml @@ -0,0 +1,20 @@ +--- +- name: Install traefik using infctl + hosts: localhost + become: true + become_user: vagrant + serial: 1 # Ensure tasks are executed one host at a time + vars_files: + - vars.yaml + + tasks: + + - name: run infctl traefik pipeline + ansible.builtin.command: infctl -f pipelines/vagrant-ingress.json + args: + chdir: /home/vagrant + environment: + LOG_FILE: /tmp/traefik_log.txt + LOG_FORMAT: none + register: traefik_result + ignore_errors: false \ No newline at end of file diff --git a/vagrant/dev/ubuntu/ansible/provision_workstation.sh b/vagrant/dev/ubuntu/ansible/provision_workstation.sh index 1077193..09e598a 100644 --- a/vagrant/dev/ubuntu/ansible/provision_workstation.sh +++ b/vagrant/dev/ubuntu/ansible/provision_workstation.sh @@ -4,7 +4,8 @@ sudo apt-get update sudo apt-get install -y software-properties-common git vim python3.10-venv jq figlet -source /vagrant/.envrc +# shellcheck disable=SC1091 +source /vagrant/.envrc # Set up ansible environment for vagrant user sudo -u vagrant mkdir -p /home/vagrant/.ansible @@ -24,10 +25,10 @@ sudo chmod +x /home/vagrant/pipelines/*.sh # Copy the Vagrant private keys (these will be synced by Vagrant) for i in {1..3}; do -sudo -u vagrant cp /vagrant/.vagrant/machines/vm$i/virtualbox/private_key /home/vagrant/.ssh/vm${i}_key -sudo -u root cp /vagrant/.vagrant/machines/vm$i/virtualbox/private_key /root/.ssh/vm${i}_key -sudo chmod 600 /home/vagrant/.ssh/vm${i}_key -sudo chmod 600 /root/.ssh/vm${i}_key +sudo -u vagrant cp "/vagrant/.vagrant/machines/vm$i/virtualbox/private_key" "/home/vagrant/.ssh/vm${i}_key" +sudo -u root cp "/vagrant/.vagrant/machines/vm$i/virtualbox/private_key" "/root/.ssh/vm${i}_key" +sudo chmod 600 "/home/vagrant/.ssh/vm${i}_key" +sudo chmod 600 "/root/.ssh/vm${i}_key" done # Disable host key checking for easier learning @@ -46,18 +47,17 @@ cd "$ANSIBLE_DIR" || { if [ ! -d "venv" ]; then echo "Creating Python virtual environment in ./venv..." python3 -m venv venv - source "venv/bin/activate" - if [ $? -ne 0 ]; then + # shellcheck disable=SC1091 + if ! source "venv/bin/activate"; then echo "Failed to activate virtual environment. Please check your Python installation." exit 1 fi echo "Virtual environment created and activated." - cp /vagrant/ansible/requirements.txt . + cp "/vagrant/ansible/requirements.txt" . if [ -f "requirements.txt" ]; then echo "Installing dependencies from requirements.txt..." pip install --upgrade pip - pip install -r requirements.txt - if [ $? -ne 0 ]; then + if ! pip install -r requirements.txt; then echo "Failed to install dependencies from requirements.txt." exit 1 fi @@ -76,7 +76,13 @@ ls -al "$ANSIBLE_VENV_DIR/bin/activate" if [ -d "$ANSIBLE_VENV_DIR" ]; then echo "Activating Ansible virtual environment..." - source "$ANSIBLE_VENV_DIR/bin/activate" + if [ -f "$ANSIBLE_VENV_DIR/bin/activate" ]; then + # shellcheck source=/dev/null + source "$ANSIBLE_VENV_DIR/bin/activate" + else + echo "Virtualenv activate script not found!" >&2 + exit 1 + fi else echo "Ansible virtual environment not found at $ANSIBLE_VENV_DIR. Please create it before running this script." exit 1 @@ -86,13 +92,13 @@ echo "" ansible --version -if [ $? -ne 0 ]; then +if ! ansible --version; then echo "Ansible is not installed or not found in the virtual environment. Please check your installation." exit 1 fi -eval `ssh-agent -s` +eval "$(ssh-agent -s)" ssh-add # ~/machines/*/virtualbox/private_key BASHRC="/home/vagrant/.bashrc" @@ -103,10 +109,11 @@ if ! grep -qF "$BLOCK_START" "$BASHRC"; then cat <<'EOF' >> "$BASHRC" # ADDED BY infctl provisioning -eval `ssh-agent -s` +eval "$(ssh-agent -s)" ssh-add ~/machines/*/virtualbox/private_key ssh-add -L -source /vagrant/.envrc +# shellcheck disable=SC1091 +source /vagrant/.envrc EOF else echo "Provisioning block already present in $BASHRC" @@ -114,7 +121,7 @@ fi echo echo ------------------------- -echo +echo su - vagrant id @@ -125,48 +132,63 @@ echo ssh-add ~/.ssh/vm*_key -ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible --inventory-file /home/vagrant/ansible/ansible_inventory.ini -m ping vm1,vm2,vm3 - -if [ $? -ne 0 ]; then +if ! ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible --inventory-file /home/vagrant/ansible/ansible_inventory.ini -m ping vm1,vm2,vm3; then echo "Ansible ping failed. Please check your Vagrant VMs and network configuration." exit 1 fi # install_keepalived.yaml -ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook install_keepalived.yaml --inventory-file ansible_inventory.ini -if [ $? -ne 0 ]; then +if ! ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook install_keepalived.yaml --inventory-file ansible_inventory.ini; then echo "Ansible playbook failed. Please check your Vagrant VMs and network configuration." exit 1 fi echo "Keepalived installation completed." # install_k3s_3node.yaml -ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook install_k3s_3node.yaml --inventory-file ansible_inventory.ini -if [ $? -ne 0 ]; then +if ! ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook install_k3s_3node.yaml --inventory-file ansible_inventory.ini; then echo "Ansible playbook failed. Please check your Vagrant VMs and network configuration." exit 1 fi # copy_k8s_config.yaml -ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook copy_k8s_config.yaml --inventory-file ansible_inventory.ini -if [ $? -ne 0 ]; then +if ! ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook copy_k8s_config.yaml --inventory-file ansible_inventory.ini; then echo "Ansible playbook failed. Please check your Vagrant VMs and network configuration." exit 1 fi -ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook install_dnsmasq.yaml --inventory-file ansible_inventory.ini -if [ $? -ne 0 ]; then +if ! ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook install_dnsmasq.yaml --inventory-file ansible_inventory.ini; then echo "Ansible playbook failed. Please check your Vagrant VMs and network configuration." exit 1 fi +# Wait for Kubernetes API to be ready +echo "Waiting for 30 seconds for Kubernetes API to be ready..." +sleep 30 +echo "done waiting for kubernetes API" + # check infctl -cd /home/vagrant -bash /home/vagrant/scripts/check_install_infctl.sh -if [ $? -ne 0 ]; then +cd /home/vagrant || exit +if ! bash /home/vagrant/scripts/check_install_infctl.sh; then echo "infctl check failed. Please check your installation." exit 1 fi +# Optionally install Longhorn, MetalLB, and Traefik +if [ "${INSTALL_LONGHORN}" = "true" ]; then + cd /home/vagrant/ansible || { echo "Failed to change directory to /home/vagrant/ansible"; exit 1; } + if ! ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook install_longhorn.yaml --inventory-file ansible_inventory.ini; then + echo "Ansible playbook failed. Please check your Vagrant VMs and network configuration." + exit 1 + fi + if ! ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook install_metallb.yaml --inventory-file ansible_inventory.ini; then + echo "Ansible playbook failed. Please check your Vagrant VMs and network configuration." + exit 1 + fi + + if ! ANSIBLE_SUPPRESS_INTERPRETER_DISCOVERY_WARNING=1 ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook install_traefik.yaml --inventory-file ansible_inventory.ini; then + echo "Ansible playbook failed. Please check your Vagrant VMs and network configuration." + exit 1 + fi +fi diff --git a/vagrant/dev/ubuntu/scripts/install_metallb.sh b/vagrant/dev/ubuntu/scripts/install_metallb.sh index 838d23a..e23e535 100755 --- a/vagrant/dev/ubuntu/scripts/install_metallb.sh +++ b/vagrant/dev/ubuntu/scripts/install_metallb.sh @@ -12,24 +12,31 @@ if ! kubectl get deployment -n metallb-system controller &>/dev/null; then exit 1 fi - # Wait for MetalLB components to be ready - echo "Waiting for MetalLB components to be ready..." - kubectl wait --namespace metallb-system \ - --for=condition=ready pod \ - --selector=app=metallb \ - --timeout=90s + echo "Waiting for MetalLB pods to be in 'Running' state..." + MAX_RETRIES=10 + RETRY=0 + + while [ $RETRY -lt $MAX_RETRIES ]; do + NOT_READY_PODS=$(kubectl -n metallb-system get pods --no-headers | grep -v 'Running' | wc -l) + if [ "$NOT_READY_PODS" -eq 0 ]; then + echo "All MetalLB pods are running." + break + else + echo "$NOT_READY_PODS MetalLB pods are not ready yet. Waiting..." + RETRY=$((RETRY + 1)) + sleep 5 + fi + done + + if [ "$NOT_READY_PODS" -ne 0 ]; then + echo "Failed to get all MetalLB pods running after $MAX_RETRIES attempts." + exit 1 + fi else echo "MetalLB is already installed." fi -# Wait for the webhook service to be ready -echo "Waiting for MetalLB webhook service to be ready..." -kubectl wait --namespace metallb-system \ - --for=condition=ready pod \ - --selector=component=webhook \ - --timeout=90s - # Check if the IPAddressPool already exists if ! kubectl get ipaddresspool -n metallb-system default &>/dev/null; then echo "Creating MetalLB IPAddressPool..."