From d81972436b2c0c33d10ecda079ce6b2f4f347a30 Mon Sep 17 00:00:00 2001 From: Tanguy Herbron Date: Sat, 22 Mar 2025 20:29:05 +0100 Subject: [PATCH] feat(Makefile): Add option to disable inventory files and update k3s-ansible dependency --- Makefile | 17 ++++++++++++----- k3s-ansible | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index cbe6c8d..4eef3b3 100644 --- a/Makefile +++ b/Makefile @@ -4,16 +4,24 @@ ANSIBLE_SSH_KEY ?= ~/.ssh/atmen CLUSTER_NAME ?= halis ifeq ($(ENV), prod) - INVENTORY:=$(shell ls -p inventory/prod | grep -v / | sed 's/^/-i inventory\/prod\//g' | sed -z 's/\n/ /g' | head -c -1) + INVENTORY:=$(shell ls -p inventory/prod -I "*.disabled" | grep -v / | sed 's/^/-i inventory\/prod\//g' | sed -z 's/\n/ /g' | head -c -1) NODE_IP:=$(shell grep -s server inventory/prod/* | head -1 | cut -d ':' -f 1 | xargs cat | grep ansible_host | head -1 | cut -d ':' -f 2 | cut -c2-) -ifeq ($(ENV), dev) - INVENTORY:=$(shell ls -p inventory/dev | grep -v / | sed 's/^/-i inventory\/dev\//g' | sed -z 's/\n/ /g' | head -c -1) +else ifeq ($(ENV), dev) + INVENTORY:=$(shell ls -p inventory/dev -I "*.disabled" | grep -v / | sed 's/^/-i inventory\/dev\//g' | sed -z 's/\n/ /g' | head -c -1) NODE_IP:=$(shell grep -s server inventory/dev/* | head -1 | cut -d ':' -f 1 | xargs cat | grep ansible_host | head -1 | cut -d ':' -f 2 | cut -c2-) else INVENTORY = -i inventory/templates/hosts.yml NODE_IP:=$(shell grep -s server inventory/templates/* | head -1 | cut -d ':' -f 1 | xargs cat | grep ansible_host | head -1 | cut -d ':' -f 2 | cut -c2-) endif +prep: + @echo "Preparing environment..." + @echo "ENV: $(ENV)" + @echo "INVENTORY: $(INVENTORY)" + @echo "NODE_IP: $(NODE_IP)" + @cp k3s-ansible/playbooks/* k3s-ansible/ + @echo "K3s-ansible configured" + init: ANSIBLE_VAULT_PASSWORD_FILE=./.vault_pass ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook $(INVENTORY) "init.yml" @@ -24,8 +32,7 @@ upgrade: ANSIBLE_VAULT_PASSWORD_FILE=./.vault_pass ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook $(INVENTORY) "k3s-upgrade.yml" conf: - ANSIBLE_VAULT_PASSWORD_FILE=./.vault_pass ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook $(INVENTORY) node-configuration - + ANSIBLE_VAULT_PASSWORD_FILE=./.vault_pass ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook $(INVENTORY) "bootstrap.yml" --extra-vars "enable_setup=true enable_wireguard=false enable_k3s=false" wg: ANSIBLE_VAULT_PASSWORD_FILE=./.vault_pass ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook $(INVENTORY) "bootstrap.yml" --extra-vars "enable_setup=false enable_wireguard=true enable_k3s=false" diff --git a/k3s-ansible b/k3s-ansible index 9c8ba5c..c383279 160000 --- a/k3s-ansible +++ b/k3s-ansible @@ -1 +1 @@ -Subproject commit 9c8ba5c1555944f02f7ffadc3b0839530b2782f7 +Subproject commit c38327927b35e7e8167cbd3e6db0d8e3f557f92c