diff --git a/Cargo.lock b/Cargo.lock index d096be9a115..60fd36d1214 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1187,6 +1187,7 @@ name = "apollo_deployments" version = "0.0.0" dependencies = [ "apollo_config", + "apollo_http_server", "apollo_infra_utils", "apollo_monitoring_endpoint", "apollo_node", diff --git a/crates/apollo_deployments/Cargo.toml b/crates/apollo_deployments/Cargo.toml index b9f57783957..3f1b2f81f62 100644 --- a/crates/apollo_deployments/Cargo.toml +++ b/crates/apollo_deployments/Cargo.toml @@ -10,6 +10,7 @@ workspace = true [dependencies] apollo_config.workspace = true +apollo_http_server.workspace = true apollo_infra_utils.workspace = true apollo_monitoring_endpoint.workspace = true apollo_node.workspace = true diff --git a/crates/apollo_deployments/resources/deployments/sepolia_integration/deployment_config_hybrid_0.json b/crates/apollo_deployments/resources/deployments/sepolia_integration/deployment_config_hybrid_0.json index c397ee9ea3a..0d1aad89f42 100644 --- a/crates/apollo_deployments/resources/deployments/sepolia_integration/deployment_config_hybrid_0.json +++ b/crates/apollo_deployments/resources/deployments/sepolia_integration/deployment_config_hybrid_0.json @@ -77,6 +77,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/sepolia_integration/deployment_config_hybrid_1.json b/crates/apollo_deployments/resources/deployments/sepolia_integration/deployment_config_hybrid_1.json index 1e9dde28d98..fb2d45b115a 100644 --- a/crates/apollo_deployments/resources/deployments/sepolia_integration/deployment_config_hybrid_1.json +++ b/crates/apollo_deployments/resources/deployments/sepolia_integration/deployment_config_hybrid_1.json @@ -77,6 +77,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/sepolia_integration/deployment_config_hybrid_2.json b/crates/apollo_deployments/resources/deployments/sepolia_integration/deployment_config_hybrid_2.json index aed49fd20e0..34e5e32bbf6 100644 --- a/crates/apollo_deployments/resources/deployments/sepolia_integration/deployment_config_hybrid_2.json +++ b/crates/apollo_deployments/resources/deployments/sepolia_integration/deployment_config_hybrid_2.json @@ -77,6 +77,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/sepolia_testnet/deployment_config_hybrid_0.json b/crates/apollo_deployments/resources/deployments/sepolia_testnet/deployment_config_hybrid_0.json index 6b9c3d57285..f54be72de48 100644 --- a/crates/apollo_deployments/resources/deployments/sepolia_testnet/deployment_config_hybrid_0.json +++ b/crates/apollo_deployments/resources/deployments/sepolia_testnet/deployment_config_hybrid_0.json @@ -81,6 +81,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/sepolia_testnet/deployment_config_hybrid_1.json b/crates/apollo_deployments/resources/deployments/sepolia_testnet/deployment_config_hybrid_1.json index eb060ad65eb..96088c8ec5b 100644 --- a/crates/apollo_deployments/resources/deployments/sepolia_testnet/deployment_config_hybrid_1.json +++ b/crates/apollo_deployments/resources/deployments/sepolia_testnet/deployment_config_hybrid_1.json @@ -81,6 +81,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/sepolia_testnet/deployment_config_hybrid_2.json b/crates/apollo_deployments/resources/deployments/sepolia_testnet/deployment_config_hybrid_2.json index 50e87a558d9..3bc88ae4b64 100644 --- a/crates/apollo_deployments/resources/deployments/sepolia_testnet/deployment_config_hybrid_2.json +++ b/crates/apollo_deployments/resources/deployments/sepolia_testnet/deployment_config_hybrid_2.json @@ -81,6 +81,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/stress_test/deployment_config_hybrid_0.json b/crates/apollo_deployments/resources/deployments/stress_test/deployment_config_hybrid_0.json index 4f95a13c43f..ecc19989dae 100644 --- a/crates/apollo_deployments/resources/deployments/stress_test/deployment_config_hybrid_0.json +++ b/crates/apollo_deployments/resources/deployments/stress_test/deployment_config_hybrid_0.json @@ -77,6 +77,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/stress_test/deployment_config_hybrid_1.json b/crates/apollo_deployments/resources/deployments/stress_test/deployment_config_hybrid_1.json index 9fae45165f2..72e8fbe6966 100644 --- a/crates/apollo_deployments/resources/deployments/stress_test/deployment_config_hybrid_1.json +++ b/crates/apollo_deployments/resources/deployments/stress_test/deployment_config_hybrid_1.json @@ -77,6 +77,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/stress_test/deployment_config_hybrid_2.json b/crates/apollo_deployments/resources/deployments/stress_test/deployment_config_hybrid_2.json index 5bddab22441..fdf1d594107 100644 --- a/crates/apollo_deployments/resources/deployments/stress_test/deployment_config_hybrid_2.json +++ b/crates/apollo_deployments/resources/deployments/stress_test/deployment_config_hybrid_2.json @@ -77,6 +77,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/testing/deployment_config_consolidated.json b/crates/apollo_deployments/resources/deployments/testing/deployment_config_consolidated.json index e82dcc366af..1af193a4aa1 100644 --- a/crates/apollo_deployments/resources/deployments/testing/deployment_config_consolidated.json +++ b/crates/apollo_deployments/resources/deployments/testing/deployment_config_consolidated.json @@ -29,6 +29,7 @@ "external_secret": null, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } } diff --git a/crates/apollo_deployments/resources/deployments/testing/deployment_config_distributed.json b/crates/apollo_deployments/resources/deployments/testing/deployment_config_distributed.json index 58b666bfbca..edefaeb72c2 100644 --- a/crates/apollo_deployments/resources/deployments/testing/deployment_config_distributed.json +++ b/crates/apollo_deployments/resources/deployments/testing/deployment_config_distributed.json @@ -133,6 +133,7 @@ "external_secret": null, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/testing/deployment_config_hybrid.json b/crates/apollo_deployments/resources/deployments/testing/deployment_config_hybrid.json index 31283c3c755..37c9917fe09 100644 --- a/crates/apollo_deployments/resources/deployments/testing/deployment_config_hybrid.json +++ b/crates/apollo_deployments/resources/deployments/testing/deployment_config_hybrid.json @@ -71,6 +71,7 @@ "external_secret": null, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_0.json b/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_0.json index 11441d773f6..92f89e2aafd 100644 --- a/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_0.json +++ b/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_0.json @@ -81,6 +81,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_1.json b/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_1.json index 89f26e773ff..02e9bead625 100644 --- a/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_1.json +++ b/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_1.json @@ -81,6 +81,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_2.json b/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_2.json index 9bf8123baef..bb2b1265c32 100644 --- a/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_2.json +++ b/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_2.json @@ -81,6 +81,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_3.json b/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_3.json index 4142a641452..3716b6cdc40 100644 --- a/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_3.json +++ b/crates/apollo_deployments/resources/deployments/testing_env_3/deployment_config_hybrid_3.json @@ -81,6 +81,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/upgrade_test/deployment_config_hybrid_0.json b/crates/apollo_deployments/resources/deployments/upgrade_test/deployment_config_hybrid_0.json index 3c26adeabbc..7eb77e1e654 100644 --- a/crates/apollo_deployments/resources/deployments/upgrade_test/deployment_config_hybrid_0.json +++ b/crates/apollo_deployments/resources/deployments/upgrade_test/deployment_config_hybrid_0.json @@ -81,6 +81,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/upgrade_test/deployment_config_hybrid_1.json b/crates/apollo_deployments/resources/deployments/upgrade_test/deployment_config_hybrid_1.json index e4a958a985b..6d2fb995fc2 100644 --- a/crates/apollo_deployments/resources/deployments/upgrade_test/deployment_config_hybrid_1.json +++ b/crates/apollo_deployments/resources/deployments/upgrade_test/deployment_config_hybrid_1.json @@ -81,6 +81,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/resources/deployments/upgrade_test/deployment_config_hybrid_2.json b/crates/apollo_deployments/resources/deployments/upgrade_test/deployment_config_hybrid_2.json index 43525c8dca2..e2fec02692b 100644 --- a/crates/apollo_deployments/resources/deployments/upgrade_test/deployment_config_hybrid_2.json +++ b/crates/apollo_deployments/resources/deployments/upgrade_test/deployment_config_hybrid_2.json @@ -81,6 +81,7 @@ }, "anti_affinity": false, "ports": { + "HttpServer": 8080, "MonitoringEndpoint": 8082 } }, diff --git a/crates/apollo_deployments/src/deployment_definitions.rs b/crates/apollo_deployments/src/deployment_definitions.rs index b12f69a559c..e5a95a980cc 100644 --- a/crates/apollo_deployments/src/deployment_definitions.rs +++ b/crates/apollo_deployments/src/deployment_definitions.rs @@ -1,5 +1,6 @@ use std::path::PathBuf; +use apollo_http_server::config::HTTP_SERVER_PORT; use apollo_monitoring_endpoint::config::MONITORING_ENDPOINT_DEFAULT_PORT; use serde::Serialize; use strum::EnumIter; @@ -122,7 +123,7 @@ impl ServicePort { ServicePort::MempoolP2p => 0, ServicePort::SierraCompiler => 0, ServicePort::StateSync => 0, - ServicePort::HttpServer => 0, + ServicePort::HttpServer => HTTP_SERVER_PORT, ServicePort::MonitoringEndpoint => MONITORING_ENDPOINT_DEFAULT_PORT, } } diff --git a/crates/apollo_deployments/src/deployments/consolidated.rs b/crates/apollo_deployments/src/deployments/consolidated.rs index e93b2bbd905..b989ac215e6 100644 --- a/crates/apollo_deployments/src/deployments/consolidated.rs +++ b/crates/apollo_deployments/src/deployments/consolidated.rs @@ -142,8 +142,10 @@ impl ServiceNameInner for ConsolidatedNodeServiceName { ServicePort::MonitoringEndpoint => { service_ports.insert(ServicePort::MonitoringEndpoint); } - ServicePort::HttpServer - | ServicePort::Batcher + ServicePort::HttpServer => { + service_ports.insert(ServicePort::HttpServer); + } + ServicePort::Batcher | ServicePort::Mempool | ServicePort::ClassManager | ServicePort::Gateway diff --git a/crates/apollo_deployments/src/deployments/distributed.rs b/crates/apollo_deployments/src/deployments/distributed.rs index be935cfd47d..94a5234f123 100644 --- a/crates/apollo_deployments/src/deployments/distributed.rs +++ b/crates/apollo_deployments/src/deployments/distributed.rs @@ -347,8 +347,10 @@ impl ServiceNameInner for DistributedNodeServiceName { ServicePort::MonitoringEndpoint => { service_ports.insert(ServicePort::MonitoringEndpoint); } - ServicePort::HttpServer - | ServicePort::Batcher + ServicePort::HttpServer => { + service_ports.insert(ServicePort::HttpServer); + } + ServicePort::Batcher | ServicePort::ClassManager | ServicePort::L1EndpointMonitor | ServicePort::L1GasPriceProvider diff --git a/crates/apollo_deployments/src/deployments/hybrid.rs b/crates/apollo_deployments/src/deployments/hybrid.rs index e69f5d215a5..26df46f87f7 100644 --- a/crates/apollo_deployments/src/deployments/hybrid.rs +++ b/crates/apollo_deployments/src/deployments/hybrid.rs @@ -309,8 +309,10 @@ impl ServiceNameInner for HybridNodeServiceName { ServicePort::MonitoringEndpoint => { service_ports.insert(ServicePort::MonitoringEndpoint); } - ServicePort::HttpServer - | ServicePort::Batcher + ServicePort::HttpServer => { + service_ports.insert(ServicePort::HttpServer); + } + ServicePort::Batcher | ServicePort::ClassManager | ServicePort::L1EndpointMonitor | ServicePort::L1GasPriceProvider diff --git a/crates/apollo_deployments/src/k8s.rs b/crates/apollo_deployments/src/k8s.rs index 1c74cba335e..54172dcf102 100644 --- a/crates/apollo_deployments/src/k8s.rs +++ b/crates/apollo_deployments/src/k8s.rs @@ -1,3 +1,4 @@ +use apollo_http_server::config::HTTP_SERVER_PORT; use serde::{Serialize, Serializer}; use crate::deployment::P2PCommunicationType; @@ -7,7 +8,6 @@ use crate::deployment_definitions::Environment; const INTERNAL_ONLY_P2P_COMMUNICATION: bool = true; const INGRESS_ROUTE: &str = "/gateway"; -const INGRESS_PORT: u16 = 8080; #[derive(Clone, Copy, Debug, PartialEq, Serialize)] pub enum Controller { @@ -105,7 +105,7 @@ pub(crate) fn get_ingress(ingress_params: IngressParams, internal: bool) -> Opti Some(Ingress::new( ingress_params, internal, - vec![IngressRule::new(String::from(INGRESS_ROUTE), INGRESS_PORT, None)], + vec![IngressRule::new(String::from(INGRESS_ROUTE), HTTP_SERVER_PORT, None)], )) } diff --git a/crates/apollo_http_server/src/config.rs b/crates/apollo_http_server/src/config.rs index c21f13286f0..d716f627904 100644 --- a/crates/apollo_http_server/src/config.rs +++ b/crates/apollo_http_server/src/config.rs @@ -6,6 +6,8 @@ use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam}; use serde::{Deserialize, Serialize}; use validator::Validate; +pub const HTTP_SERVER_PORT: u16 = 8080; + /// The http server connection related configuration. #[derive(Clone, Debug, Serialize, Deserialize, Validate, PartialEq)] pub struct HttpServerConfig { @@ -24,6 +26,6 @@ impl SerializeConfig for HttpServerConfig { impl Default for HttpServerConfig { fn default() -> Self { - Self { ip: IpAddr::from(Ipv4Addr::UNSPECIFIED), port: 8080 } + Self { ip: IpAddr::from(Ipv4Addr::UNSPECIFIED), port: HTTP_SERVER_PORT } } }