diff --git a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/runtime/DeploymentExecutor.java b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/runtime/DeploymentExecutor.java index 60590c87..9ddd4754 100644 --- a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/runtime/DeploymentExecutor.java +++ b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/runtime/DeploymentExecutor.java @@ -275,8 +275,8 @@ public class DeploymentExecutor { envVars.put("CAMELEER_APPLICATION_ID", app.slug()); envVars.put("CAMELEER_ENVIRONMENT_ID", env.slug()); envVars.put("CAMELEER_SERVER_URL", config.serverUrl()); - envVars.put("CAMELEER_ROUTE_CONTROL_ENABLED", "true"); - envVars.put("CAMELEER_REPLAY_ENABLED", "true"); + envVars.put("CAMELEER_ROUTE_CONTROL_ENABLED", String.valueOf(config.routeControlEnabled())); + envVars.put("CAMELEER_REPLAY_ENABLED", String.valueOf(config.replayEnabled())); if (bootstrapToken != null && !bootstrapToken.isBlank()) { envVars.put("CAMELEER_AUTH_TOKEN", bootstrapToken); } diff --git a/cameleer3-server-core/src/main/java/com/cameleer3/server/core/runtime/ConfigMerger.java b/cameleer3-server-core/src/main/java/com/cameleer3/server/core/runtime/ConfigMerger.java index a7b3ea1c..fbf4dfc4 100644 --- a/cameleer3-server-core/src/main/java/com/cameleer3/server/core/runtime/ConfigMerger.java +++ b/cameleer3-server-core/src/main/java/com/cameleer3/server/core/runtime/ConfigMerger.java @@ -28,7 +28,9 @@ public final class ConfigMerger { stringVal(appConfig, envConfig, "routingDomain", global.routingDomain()), stringVal(appConfig, envConfig, "serverUrl", global.serverUrl()), intVal(appConfig, envConfig, "replicas", 1), - stringVal(appConfig, envConfig, "deploymentStrategy", "blue-green") + stringVal(appConfig, envConfig, "deploymentStrategy", "blue-green"), + boolVal(appConfig, envConfig, "routeControlEnabled", true), + boolVal(appConfig, envConfig, "replayEnabled", true) ); } diff --git a/cameleer3-server-core/src/main/java/com/cameleer3/server/core/runtime/ResolvedContainerConfig.java b/cameleer3-server-core/src/main/java/com/cameleer3/server/core/runtime/ResolvedContainerConfig.java index 0bc36081..2a5d7354 100644 --- a/cameleer3-server-core/src/main/java/com/cameleer3/server/core/runtime/ResolvedContainerConfig.java +++ b/cameleer3-server-core/src/main/java/com/cameleer3/server/core/runtime/ResolvedContainerConfig.java @@ -17,7 +17,9 @@ public record ResolvedContainerConfig( String routingDomain, String serverUrl, int replicas, - String deploymentStrategy + String deploymentStrategy, + boolean routeControlEnabled, + boolean replayEnabled ) { public long memoryLimitBytes() { return (long) memoryLimitMb * 1024 * 1024;