From 135da2371e29f32fc129b1345bee70edc76a41e8 Mon Sep 17 00:00:00 2001
From: Josh Siviour <mrk@mulgadc.com>
Date: Sun, 2 Aug 2026 08:01:45 +1000
Subject: [PATCH] fix: scope golangci-lint cache per worktree, correct
 eks-node-gpu catalog description (#629)

* fix: scope golangci-lint cache per worktree

golangci-lint's default cache under ~/.cache/golangci-lint is keyed by
module path rather than worktree path, so parallel worktrees of this
module collide and surface each other's lint issues, including from
worktrees that have since been deleted.

* fix: correct eks-node-gpu catalog description to match agent-only image

The GPU node image never installs eks-token-webhook or a server/agent
role selector, per scripts/images/eks-node-gpu/manifest.conf; it ships
ecr-credential-provider only and is agent-only because GPU nodes never
run the EKS control plane.
---
 .gitignore               | 3 +++
 Makefile                 | 5 +++++
 spinifex/utils/images.go | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e928c3aba..a843addba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,6 @@ Thumbs.db
 
 # Test reports
 *-report.txt
+
+# Per-worktree golangci-lint cache
+/.cache/
diff --git a/Makefile b/Makefile
index 072560d7b..7f9726be9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,11 @@
 GO_PROJECT_NAME := spx
 SHELL := /bin/bash
 
+# golangci-lint's default cache (~/.cache/golangci-lint) is keyed by module
+# path, not worktree path, so parallel worktrees of this module collide and
+# surface each other's issues. Scope it per worktree.
+export GOLANGCI_LINT_CACHE := $(CURDIR)/.cache/golangci-lint
+
 # Detect architecture for cross-platform support
 ARCH := $(shell uname -m)
 ifeq ($(ARCH),x86_64)
diff --git a/spinifex/utils/images.go b/spinifex/utils/images.go
index 3e5e35c54..5343a595e 100644
--- a/spinifex/utils/images.go
+++ b/spinifex/utils/images.go
@@ -440,7 +440,7 @@ var AvailableImages = map[string]Images{
 	// tags — CreateNodegroup selects it for GPU instance types instead of the Alpine AMI.
 	"spinifex-eks-node-gpu": {
 		Name:         "spinifex-eks-node-gpu",
-		Description:  "Mulga EKS GPU node image — Ubuntu 26.04 + NVIDIA driver + K3s v1.32.5 + eks-token-webhook (server|agent role selected at first boot)",
+		Description:  "Mulga EKS GPU node image — Ubuntu 26.04 + NVIDIA driver + K3s v1.32.5, agent-only (GPU nodes never run the EKS control plane, so no role selector or eks-token-webhook)",
 		Distro:       "ubuntu",
 		Version:      "26.04",
 		Arch:         "x86_64",