Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ image:
# Config Configuration
# See docs/CONFIGMAP_CONFIGURATION.md for all available options
config:
configList: crates/apollo_deployments/resources/services/consolidated/replacer_deployment_node.json
# mountPath: "/config/sequencer/presets" # Override default mount path
# readOnly: true # Whether the config map is read only. Defaults to true.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ replicas: 1
# Config Configuration
# See docs/CONFIGMAP_CONFIGURATION.md for all available options
config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_committer.json
# mountPath: "/config/sequencer/presets" # Override default mount path

sequencerConfig: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ replicas: 1
# Config Configuration
# See docs/CONFIGMAP_CONFIGURATION.md for all available options
config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_core.json
# mountPath: "/config/sequencer/presets" # Override default mount path
# readOnly: true # Whether the config map is read only. Defaults to true.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ replicas: 1
# Config Configuration
# See docs/CONFIGMAP_CONFIGURATION.md for all available options
config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_gateway.json
# mountPath: "/config/sequencer/presets" # Override default mount path
# readOnly: true # Whether the config map is read only. Defaults to true.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ replicas: 1
# Config Configuration
# See docs/CONFIGMAP_CONFIGURATION.md for all available options
config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_l1.json
# mountPath: "/config/sequencer/presets" # Override default mount path
# readOnly: true # Whether the config map is read only. Defaults to true.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ replicas: 1
# Config Configuration
# See docs/CONFIGMAP_CONFIGURATION.md for all available options
config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_mempool.json
# mountPath: "/config/sequencer/presets" # Override default mount path
# readOnly: true # Whether the config map is read only. Defaults to true.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ replicas: 1
# Config Configuration
# See docs/CONFIGMAP_CONFIGURATION.md for all available options
config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_sierra_compiler.json
# mountPath: "/config/sequencer/presets" # Override default mount path
# readOnly: true # Whether the config map is read only. Defaults to true.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
name: committer
config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_committer.json

service:
enabled: true
type: ClusterIP
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
name: core
config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_core.json
service:
ports:
- name: batcher
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
name: gateway
config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_gateway.json

service:
enabled: true
type: ClusterIP
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
name: l1
config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_l1.json

service:
enabled: true
type: ClusterIP
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
name: mempool
config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_mempool.json
service:
ports:
- name: mempool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
name: sierracompiler
config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_sierra_compiler.json

service:
enabled: true
type: ClusterIP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ image:
digest: ''
imagePullPolicy: IfNotPresent

config:
configList: deployments/sequencer/test/app_configs/sequencer/replacer_deployment_common.json

service:
enabled: true
type: "ClusterIP"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ name: committer

replicas: 1

config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_committer.json

service:
enabled: true
type: ClusterIP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ name: core

replicas: 1

config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_core.json

service:
enabled: true
type: ClusterIP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ name: gateway

replicas: 1

config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_gateway.json

service:
enabled: true
type: ClusterIP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ name: l1

replicas: 1

config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_l1.json

service:
enabled: true
type: ClusterIP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ name: mempool

replicas: 1

config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_mempool.json

service:
enabled: true
type: ClusterIP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ name: sierracompiler

replicas: 1

config:
configList: crates/apollo_deployments/resources/services/hybrid/replacer_deployment_sierra_compiler.json

service:
enabled: true
type: ClusterIP
Expand Down
7 changes: 2 additions & 5 deletions deployments/sequencer/src/config/merger.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def _load_common_yaml(path: str, config_base_dir: str | None = None) -> dict | N
def _merge_common_into_service(
common_config: CommonConfig | dict | None, service_config: ServiceConfig
) -> ServiceConfig:
"""Merge common config into service config. Common first, service overrides. Special handling for service.ports (merge by name), config.sequencerConfig, config.configList."""
"""Merge common config into service config. Common first, service overrides. Special handling for service.ports (merge by name), config.sequencerConfig."""
service_dict = service_config.model_dump(mode="python", exclude_unset=True, exclude_none=True)
if common_config is None:
return service_config
Expand Down Expand Up @@ -98,11 +98,8 @@ def deep_merge(base: dict, overlay: dict) -> dict:
**deepcopy(common_val["sequencerConfig"]),
**merged_cfg.get("sequencerConfig", {}),
}
# Common first, service overrides: only set configList from common when service has none
if "configList" in common_val and "configList" not in merged_cfg:
merged_cfg["configList"] = deepcopy(common_val["configList"])
for k, v in common_val.items():
if k in ("sequencerConfig", "configList"):
if k == "sequencerConfig":
continue
if k not in merged_cfg:
merged_cfg[k] = deepcopy(v)
Expand Down
3 changes: 0 additions & 3 deletions deployments/sequencer/src/config/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,6 @@ class PriorityClass(StrictBaseModel):


class Config(StrictBaseModel):
configList: Optional[
str
] = None # Path to JSON file containing list of config paths (required for service configs, optional for shared config)
mountPath: Optional[str] = None # Default: "/config/sequencer/presets/"
readOnly: Optional[bool] = None # Whether the config map mount is read-only. Defaults to True.
sequencerConfig: Optional[
Expand Down
4 changes: 0 additions & 4 deletions deployments/sequencer/src/constructs/configmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ def _get_config_map(self) -> k8s.KubeConfigMap:
raise ValueError(
f"config is required for service '{self.service_config.name}' but was not provided"
)
if not self.service_config.config.configList:
raise ValueError(
f"config.configList is required for service '{self.service_config.name}' but was not provided"
)

node_config = self._build_native_node_config()

Expand Down
6 changes: 3 additions & 3 deletions deployments/sequencer/src/constructs/helpers/pod_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def _build_container_args(self) -> list[str]:

# Add --config_file /config/sequencer/presets/config (ConfigMap)
# Note: node version uses directory mount, so path is just the directory + "config"
if self.service_config.config and self.service_config.config.configList:
if self.service_config.config:
mount_path = (
getattr(self.service_config.config, "mountPath", None)
or "/config/sequencer/presets/"
Expand Down Expand Up @@ -194,7 +194,7 @@ def _build_volume_mounts(self) -> list[k8s.VolumeMount]:
volume_mounts: list[k8s.VolumeMount] = []

# Auto-mount ConfigMap if config exists (as directory, not file)
if self.service_config.config and self.service_config.config.configList:
if self.service_config.config:
# Default mountPath is "/config/sequencer/presets/" (with trailing slash to match node/)
mount_path = (
getattr(self.service_config.config, "mountPath", None)
Expand Down Expand Up @@ -315,7 +315,7 @@ def _build_volumes(self) -> list[k8s.Volume]:
volumes: list[k8s.Volume] = []

# Always create ConfigMap volume if config exists
if self.service_config.config and self.service_config.config.configList:
if self.service_config.config:
volumes.append(
k8s.Volume(
name=f"sequencer-{self.service_config.name}-config",
Expand Down

This file was deleted.

This file was deleted.

8 changes: 1 addition & 7 deletions scripts/system_tests/liveness_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import sys
import time
from multiprocessing import Process, Queue
from typing import Any, Dict, List, Optional, Union
from typing import Any, Dict, List, Union

import numbers
import requests
Expand All @@ -18,12 +18,6 @@ def get_services_from_configs(services: List[Dict[str, Any]]) -> List[str]:
return [s["name"] for s in services]


def get_config_list(service_config: Dict[str, Any]) -> Optional[str]:
"""Extract configList path from merged service config."""
config = service_config.get("config", {})
return config.get("configList")


def get_monitoring_endpoint_port(service_config: Dict[str, Any]) -> Union[int, float]:
"""Extract monitoring endpoint port from merged service config."""
# Check sequencerConfig first (most common location)
Expand Down
Loading