From 68a4ca6bb9dcf5df3bd4f9d703aaaf4e3ae2b4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Verstraeten?= <cedric@verstraeten.io>
Date: Thu, 4 Jun 2026 21:32:31 +0200
Subject: [PATCH] Update main.go

---
 machinery/src/config/main.go | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/machinery/src/config/main.go b/machinery/src/config/main.go
index f432cc6..7fd9500 100644
--- a/machinery/src/config/main.go
+++ b/machinery/src/config/main.go
@@ -215,7 +215,18 @@ func OverrideWithEnvironmentVariables(configuration *models.Configuration) {
 		configuration.GlobalConfig = globalWrap.Config
 
 		// Parse the per-agent (custom) configuration from the AGENT_* variables.
-		customWrap := &models.Configuration{Config: configuration.CustomConfig}
+		// In ConfigMap mode the per-agent overrides are delivered exclusively
+		// through AGENT_* environment variables, so we must start from an empty
+		// configuration rather than the bundled config.json that OpenConfig loaded
+		// into CustomConfig. Otherwise defaults from that file (e.g. cloud="s3")
+		// would leak into the custom config and be mistaken for explicit per-agent
+		// overrides, hiding inherited global settings (the factory edit page would
+		// show the local default instead of the inherited global persistence).
+		customBase := configuration.CustomConfig
+		if isConfigMapMode() {
+			customBase = models.Config{}
+		}
+		customWrap := &models.Configuration{Config: customBase}
 		initConfigPointers(&customWrap.Config)
 		applyAgentEnvVars(customWrap, "", false)
 		configuration.CustomConfig = customWrap.Config
@@ -233,6 +244,21 @@ func OverrideWithEnvironmentVariables(configuration *models.Configuration) {
 	}
 }
 
+// isConfigMapMode reports whether the agent is running in ConfigMap mode, i.e.
+// whether a global configuration layer is delivered separately through
+// GLOBAL_AGENT_* environment variables. In that mode the per-agent (custom)
+// configuration must be built solely from the AGENT_* overrides and must not be
+// seeded with the bundled config.json defaults, so that inherited global
+// settings remain distinguishable from explicit per-agent overrides.
+func isConfigMapMode() bool {
+	for _, env := range os.Environ() {
+		if strings.HasPrefix(env, "GLOBAL_AGENT_") {
+			return true
+		}
+	}
+	return false
+}
+
 // initConfigPointers ensures all pointer sub-structs are non-nil so that the
 // environment-variable parsing can assign into them without dereferencing a nil
 // pointer.