deployment: add http server port to the deployment file (starkware-libs#8056)

nadin-Starkware · chudkowsky · commit 7c2e3c721643 · 2025-07-21T09:40:11.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@`
`77`	`77`	`},`
`78`	`78`	`"anti_affinity": false,`
`79`	`79`	`"ports": {`
	`80`	`+ "HttpServer": 8080,`
`80`	`81`	`"MonitoringEndpoint": 8082`
`81`	`82`	`}`
`82`	`83`	`},`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@`
`81`	`81`	`},`
`82`	`82`	`"anti_affinity": false,`
`83`	`83`	`"ports": {`
	`84`	`+ "HttpServer": 8080,`
`84`	`85`	`"MonitoringEndpoint": 8082`
`85`	`86`	`}`
`86`	`87`	`},`