Adding all changes for environments

Author: jasonyang101

src/agentex/lib/cli/commands/agents.py

@@ -255,9 +255,6 @@ def deploy(
     repository: str | None = typer.Option(
         None, help="Override the repository for deployment"
     ),
-    override_file: str | None = typer.Option(
-        None, help="Path to override configuration file"
-    ),
     interactive: bool = typer.Option(
         True, "--interactive/--no-interactive", help="Enable interactive prompts"
     ),
@@ -307,16 +304,6 @@ def deploy(
             else:
                 raise DeploymentError(f"No namespace found in environments.yaml for environment: {environment}, and not passed in as --namespace")
 
-        # Validate override file exists if provided
-        if override_file:
-            override_path = Path(override_file)
-            if not override_path.exists():
-                console.print(
-                    f"[red]Error:[/red] Override file not found: {override_file}"
-                )
-                raise typer.Exit(1)
-
-
         # Confirm deployment (only in interactive mode)
         console.print("\n[bold]Deployment Summary:[/bold]")
         console.print(f"  Manifest: {manifest}")
@@ -325,8 +312,6 @@ def deploy(
         console.print(f"  Namespace: {namespace}")
         if tag:
             console.print(f"  Image Tag: {tag}")
-        if override_file:
-            console.print(f"  Override File: {override_file}")
 
         if interactive:
             proceed = questionary.confirm("Proceed with deployment?").ask()
@@ -355,7 +340,6 @@ def deploy(
             cluster_name=cluster,
             namespace=namespace,
             deploy_overrides=deploy_overrides,
-            override_file_path=override_file,
             environment_name=environment,
         )
 

src/agentex/lib/cli/handlers/deploy_handlers.py

@@ -15,7 +15,7 @@
 from agentex.lib.environment_variables import EnvVarKeys
 from agentex.lib.sdk.config.agent_config import AgentConfig
 from agentex.lib.sdk.config.agent_manifest import AgentManifest
-from agentex.lib.sdk.config.deployment_config import ClusterConfig
+
 from agentex.lib.utils.logging import make_logger
 
 logger = make_logger(__name__)
@@ -76,25 +76,6 @@ def add_helm_repo() -> None:
         raise HelmError(f"Failed to add helm repository: {e}") from e
 
 
-def load_override_config(override_file_path: str | None = None) -> ClusterConfig | None:
-    """Load override configuration from specified file path"""
-    if not override_file_path:
-        return None
-
-    override_path = Path(override_file_path)
-    if not override_path.exists():
-        raise DeploymentError(f"Override file not found: {override_file_path}")
-
-    try:
-        with open(override_path) as f:
-            config_data = yaml.safe_load(f)
-            return ClusterConfig(**config_data) if config_data else None
-    except Exception as e:
-        raise DeploymentError(
-            f"Failed to load override config from {override_file_path}: {e}"
-        ) from e
-
-
 
 def convert_env_vars_dict_to_list(env_vars: dict[str, str]) -> list[dict[str, str]]:
     """Convert a dictionary of environment variables to a list of dictionaries"""
@@ -117,13 +98,12 @@ def add_acp_command_to_helm_values(helm_values: dict[str, Any], manifest: AgentM
 def merge_deployment_configs(
     manifest: AgentManifest,
     agent_env_config: AgentEnvironmentConfig | None,
-    cluster_config: ClusterConfig | None,
     deploy_overrides: InputDeployOverrides,
     manifest_path: str,
 ) -> dict[str, Any]:
     agent_config: AgentConfig = manifest.agent
 
-    """Merge global deployment config with cluster-specific overrides into helm values"""
+    """Merge global deployment config with environment-specific overrides into helm values"""
     if not manifest.deployment:
         raise DeploymentError("No deployment configuration found in manifest")
 
@@ -186,13 +166,25 @@ def merge_deployment_configs(
                 "taskQueue": temporal_config.queue_name,
             }
 
-    # Collect all environment variables with conflict detection
+    # Collect all environment variables with proper precedence
+    # Priority: manifest -> environments.yaml -> secrets (highest)
     all_env_vars: dict[str, str] = {}
     secret_env_vars: list[dict[str, str]] = []
 
-    # Start with agent_config env vars
+    # Start with agent_config env vars from manifest
     if agent_config.env:
         all_env_vars.update(agent_config.env)
+    
+    # Override with environment config env vars if they exist
+    if agent_env_config and agent_env_config.helm_overrides and "env" in agent_env_config.helm_overrides:
+        env_overrides = agent_env_config.helm_overrides["env"]
+        if isinstance(env_overrides, list):
+            # Convert list format to dict for easier merging
+            env_override_dict: dict[str, str] = {}
+            for env_var in env_overrides:
+                if isinstance(env_var, dict) and "name" in env_var and "value" in env_var:
+                    env_override_dict[str(env_var["name"])] = str(env_var["value"])
+            all_env_vars.update(env_override_dict)
 
 
 
@@ -226,56 +218,6 @@ def merge_deployment_configs(
                 }
             )
 
-    # Apply cluster-specific overrides
-    if cluster_config:
-        if cluster_config.image:
-            if cluster_config.image.repository:
-                helm_values["global"]["image"]["repository"] = (
-                    cluster_config.image.repository
-                )
-            if cluster_config.image.tag:
-                helm_values["global"]["image"]["tag"] = cluster_config.image.tag
-
-        if cluster_config.replicaCount is not None:
-            helm_values["replicaCount"] = cluster_config.replicaCount
-
-        if cluster_config.resources:
-            if cluster_config.resources.requests:
-                helm_values["resources"]["requests"].update(
-                    {
-                        "cpu": cluster_config.resources.requests.cpu,
-                        "memory": cluster_config.resources.requests.memory,
-                    }
-                )
-            if cluster_config.resources.limits:
-                helm_values["resources"]["limits"].update(
-                    {
-                        "cpu": cluster_config.resources.limits.cpu,
-                        "memory": cluster_config.resources.limits.memory,
-                    }
-                )
-
-        # Handle cluster env vars with conflict detection
-        if cluster_config.env:
-            # Convert cluster env list to dict for easier conflict detection
-            cluster_env_dict = {env_var["name"]: env_var["value"] for env_var in cluster_config.env}
-            
-            # Check for conflicts with secret env vars
-            for secret_env_var in secret_env_vars:
-                if secret_env_var["name"] in cluster_env_dict:
-                    logger.warning(
-                        f"Environment variable '{secret_env_var['name']}' is defined in both "
-                        f"cluster config env and secretEnvVars. The secret value will take precedence."
-                    )
-                    del cluster_env_dict[secret_env_var["name"]]
-            
-            # Update all_env_vars with cluster overrides
-            all_env_vars.update(cluster_env_dict)
-
-        # Apply additional arbitrary overrides
-        if cluster_config.additional_overrides:
-            _deep_merge(helm_values, cluster_config.additional_overrides)
-
     # Apply agent environment configuration overrides
     if agent_env_config:
         # Add auth principal env var if environment config is set
@@ -292,8 +234,8 @@ def merge_deployment_configs(
             _deep_merge(helm_values, agent_env_config.helm_overrides)
 
     # Set final environment variables
+    # Environment variable precedence: manifest -> environments.yaml -> secrets (highest)
     if all_env_vars:
-        # WORRY: That this will override env vars set in the environments.yaml file
         helm_values["env"] = convert_env_vars_dict_to_list(all_env_vars)
 
     if secret_env_vars:
@@ -309,7 +251,7 @@ def merge_deployment_configs(
     # Handle image pull secrets
     if manifest.deployment and manifest.deployment.imagePullSecrets:
         pull_secrets = [
-            pull_secret.to_dict()
+            pull_secret.model_dump()
             for pull_secret in manifest.deployment.imagePullSecrets
         ]
         helm_values["global"]["imagePullSecrets"] = pull_secrets
@@ -347,7 +289,6 @@ def deploy_agent(
     cluster_name: str,
     namespace: str,
     deploy_overrides: InputDeployOverrides,
-    override_file_path: str | None = None,
     environment_name: str | None = None,
 ) -> None:
     """Deploy an agent using helm"""
@@ -360,7 +301,6 @@ def deploy_agent(
     check_and_switch_cluster_context(cluster_name)
 
     manifest = AgentManifest.from_yaml(file_path=manifest_path)
-    override_config = load_override_config(override_file_path)
 
     # Load agent environment configuration
     agent_env_config = None
@@ -373,19 +313,11 @@ def deploy_agent(
         else:
             console.print(f"[yellow]⚠[/yellow] No environments.yaml found, skipping environment-specific config")
 
-    # Provide feedback about override configuration
-    if override_config:
-        console.print(f"[green]✓[/green] Using override config: {override_file_path}")
-    else:
-        console.print(
-            "[yellow]ℹ[/yellow] No override config specified, using global defaults"
-        )
-
     # Add helm repository/update
     add_helm_repo()
 
     # Merge configurations
-    helm_values = merge_deployment_configs(manifest, agent_env_config, override_config, deploy_overrides, manifest_path)
+    helm_values = merge_deployment_configs(manifest, agent_env_config, deploy_overrides, manifest_path)
 
     # Create values file
     values_file = create_helm_values_file(helm_values)

src/agentex/lib/cli/templates/default/environments.yaml.j2

@@ -43,7 +43,7 @@ environments:
         user_id: # TODO: Fill in
         account_id: # TODO: Fill in
     helm_overrides:
-      replicas: 2
+      replicaCount: 2
       resources:
         requests:
           cpu: "500m"

src/agentex/lib/cli/templates/sync/environments.yaml.j2

@@ -42,7 +42,7 @@ environments:
         user_id: # TODO: Fill in
         account_id: # TODO: Fill in
     helm_overrides:
-      replicas: 2
+      replicaCount: 2
       resources:
         requests:
           cpu: "500m"

src/agentex/lib/cli/templates/temporal/environments.yaml.j2

@@ -44,7 +44,7 @@ environments:
         account_id: # TODO: Fill in
     helm_overrides: 
       # This is used to override the global helm values.yaml file in the agentex-agent helm charts
-      replicas: 2
+      replicaCount: 2
       resources:
         requests:
           cpu: "500m"
@@ -54,7 +54,7 @@ environments:
           memory: "2Gi"
       temporal:
         enabled: true
-        replicas: 2
+        replicaCount: 2
         resources:
           requests:
             cpu: "500m"