From caa873db498c05569063e558b4015f3a8aef4ad6 Mon Sep 17 00:00:00 2001 From: FileMagic Date: Sun, 19 Jul 2026 19:22:06 +0000 Subject: [PATCH] Makefile [kubernetes/]: resolve OVMF.fd path via nix eval --- kubernetes/Makefile | 7 ++++--- 1 file(s) changed, 4 insertion(s)(+), 3 deletion(s)(-) diff --git a/kubernetes/Makefile b/kubernetes/Makefile --- a/kubernetes/Makefile +++ b/kubernetes/Makefile @@ -6,6 +6,7 @@ # Cluster configuration (override via environment) CLUSTER_INDEX ?= 0 WORKER_COUNT ?= 3 +OVMF_CODE_PATH := $(shell nix eval --raw nixpkgs#OVMF.fd) export CLUSTER_INDEX export WORKER_COUNT @@ -24,11 +25,11 @@ build: ## Build NixOS VM images nix build .#images deploy: ## Destroy old VMs and create new ones from images - cd $(TOFU) && tofu destroy -auto-approve - cd $(TOFU) && tofu apply -auto-approve -var "image_dir=../result" -var "cluster_index=$(CLUSTER_INDEX)" -var "worker_count=$(WORKER_COUNT)" + cd $(TOFU) && tofu destroy -auto-approve -var "cluster_index=$(CLUSTER_INDEX)" -var "worker_count=$(WORKER_COUNT)" -var "ovmf_code_path=$(OVMF_CODE_PATH)" + cd $(TOFU) && tofu apply -auto-approve -var "image_dir=../result" -var "cluster_index=$(CLUSTER_INDEX)" -var "worker_count=$(WORKER_COUNT)" -var "ovmf_code_path=$(OVMF_CODE_PATH)" down: ## Destroy all VMs - cd $(TOFU) && tofu destroy -auto-approve -var "cluster_index=$(CLUSTER_INDEX)" -var "worker_count=$(WORKER_COUNT)" + cd $(TOFU) && tofu destroy -auto-approve -var "cluster_index=$(CLUSTER_INDEX)" -var "worker_count=$(WORKER_COUNT)" -var "ovmf_code_path=$(OVMF_CODE_PATH)" wait-ssh: ## Wait for SSH on master (checks every 5s, 60 retries) @echo "Waiting for SSH on $(MASTER_IP)..." -- tangled.sh