rig major updates

rig/Makefile

@@ -4,8 +4,10 @@
 # Notes: docs/notes/Makefile.md
 
 # Identity and ports, asked once of ctrl/ports.sh, read positionally (selftest pins the order):
-#   CLUSTER KUBECONTEXT HTTP HTTPS TILT REGISTRY MANIFESTS_DIR
-FACTS     := $(shell bash ctrl/ports.sh active 2>/dev/null)
+#   CLUSTER KUBECONTEXT HTTP HTTPS TILT REGISTRY MANIFESTS_DIR OVERLAY_DIR
+# OVERLAY/CLUSTER given as make arguments are handed over explicitly: before make 4.4,
+# $(shell) does not see them, and the context would follow the wrong environment.
+FACTS     := $(shell $(if $(OVERLAY),OVERLAY='$(OVERLAY)') $(if $(CLUSTER),CLUSTER='$(CLUSTER)') bash ctrl/ports.sh active 2>/dev/null)
 SLUG      := $(shell echo '$(notdir $(CURDIR))' | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9-' '-' | sed 's/^-*//; s/-*$$//')
 # Fall back to the folder name, not empty, if ports.sh fails on a broken config.
 CLUSTER   := $(or $(word 1,$(FACTS)),$(SLUG))