Address comments

Author: JasonVranek

crates/common/src/config/constants.rs

@@ -14,9 +14,11 @@ pub const METRICS_PORT_ENV: &str = "CB_METRICS_PORT";
 pub const LOGS_DIR_ENV: &str = "CB_LOGS_DIR";
 pub const LOGS_DIR_DEFAULT: &str = "/var/logs/commit-boost";
 
+/// Default Docker image
+pub const COMMIT_BOOST_IMAGE_DEFAULT: &str = "ghcr.io/commit-boost/commit-boost:latest";
+
 ///////////////////////// PBS /////////////////////////
 
-pub const PBS_IMAGE_DEFAULT: &str = "ghcr.io/commit-boost/commit-boost:latest";
 pub const PBS_SERVICE_NAME: &str = "pbs";
 
 /// Where to receive BuilderAPI calls from beacon node
@@ -26,7 +28,6 @@ pub const MUX_PATH_ENV: &str = "CB_MUX_PATH";
 
 ///////////////////////// SIGNER /////////////////////////
 
-pub const SIGNER_IMAGE_DEFAULT: &str = "ghcr.io/commit-boost/commit-boost:latest";
 pub const SIGNER_SERVICE_NAME: &str = "signer";
 
 /// Where the signer module should open the server

crates/common/src/config/pbs.rs

@@ -23,8 +23,8 @@ use super::{
 use crate::{
     commit::client::SignerClient,
     config::{
-        CONFIG_ENV, MODULE_JWT_ENV, MuxKeysLoader, PBS_IMAGE_DEFAULT, PBS_SERVICE_NAME, PbsMuxes,
-        SIGNER_TLS_CERTIFICATE_NAME, SIGNER_TLS_CERTIFICATES_PATH_ENV, SIGNER_URL_ENV,
+        COMMIT_BOOST_IMAGE_DEFAULT, CONFIG_ENV, MODULE_JWT_ENV, MuxKeysLoader, PBS_SERVICE_NAME,
+        PbsMuxes, SIGNER_TLS_CERTIFICATE_NAME, SIGNER_TLS_CERTIFICATES_PATH_ENV, SIGNER_URL_ENV,
         SignerConfig, TlsMode, load_env_var, load_file_from_env,
     },
     pbs::{
@@ -257,7 +257,7 @@ pub struct PbsModuleConfig {
 }
 
 fn default_pbs() -> String {
-    PBS_IMAGE_DEFAULT.to_string()
+    COMMIT_BOOST_IMAGE_DEFAULT.to_string()
 }
 
 /// Loads the default pbs config, i.e. with no signer client or custom data

crates/common/src/config/signer.rs

@@ -22,7 +22,8 @@ use super::{
 };
 use crate::{
     config::{
-        DIRK_CA_CERT_ENV, DIRK_CERT_ENV, DIRK_DIR_SECRETS_ENV, DIRK_KEY_ENV, SIGNER_IMAGE_DEFAULT,
+        COMMIT_BOOST_IMAGE_DEFAULT, DIRK_CA_CERT_ENV, DIRK_CERT_ENV, DIRK_DIR_SECRETS_ENV,
+        DIRK_KEY_ENV,
     },
     signer::{ProxyStore, SignerLoader},
     types::{Chain, ModuleId},
@@ -164,7 +165,7 @@ impl SignerConfig {
 }
 
 fn default_signer_image() -> String {
-    SIGNER_IMAGE_DEFAULT.to_string()
+    COMMIT_BOOST_IMAGE_DEFAULT.to_string()
 }
 
 fn default_tls_mode() -> TlsMode {
@@ -424,7 +425,10 @@ mod tests {
     use alloy::primitives::{Uint, b256};
 
     use super::*;
-    use crate::config::{LogsSettings, ModuleKind, PbsConfig, StaticModuleConfig, StaticPbsConfig};
+    use crate::config::{
+        COMMIT_BOOST_IMAGE_DEFAULT, LogsSettings, ModuleKind, PbsConfig, StaticModuleConfig,
+        StaticPbsConfig,
+    };
 
     // Wrapper needed because TOML requires a top-level struct (can't serialize
     // a bare enum).
@@ -437,7 +441,7 @@ mod tests {
         SignerConfig {
             host: Ipv4Addr::LOCALHOST,
             port: 20000,
-            docker_image: SIGNER_IMAGE_DEFAULT.to_string(),
+            docker_image: COMMIT_BOOST_IMAGE_DEFAULT.to_string(),
             jwt_auth_fail_limit: 3,
             jwt_auth_fail_timeout_seconds: 300,
             tls_mode,
@@ -851,7 +855,7 @@ mod tests {
         cfg.signer = Some(SignerConfig {
             host: Ipv4Addr::new(127, 0, 0, 1),
             port: 20000,
-            docker_image: SIGNER_IMAGE_DEFAULT.to_string(),
+            docker_image: COMMIT_BOOST_IMAGE_DEFAULT.to_string(),
             jwt_auth_fail_limit: 3,
             jwt_auth_fail_timeout_seconds: 300,
             tls_mode: TlsMode::Insecure,

provisioning/k8s/commit-boost/values.yaml

@@ -113,8 +113,10 @@ commitBoost:
       repository: ghcr.io/commit-boost/commit-boost
       pullPolicy: IfNotPresent
       tag: "v0.4.0"
+    command: ["commit-boost"]
+    args: ["pbs"]
     config:
-      chain: "Holesky"
+      chain: "Hoodi"
       metrics:
         server_port: 10000
         prometheus_config: "/dev/null"

tests/src/utils.rs

@@ -8,8 +8,8 @@ use std::{
 use alloy::primitives::{B256, U256};
 use cb_common::{
     config::{
-        CommitBoostConfig, LogsSettings, ModuleKind, ModuleSigningConfig, PbsConfig,
-        PbsModuleConfig, RelayConfig, ReverseProxyHeaderSetup, SIGNER_IMAGE_DEFAULT,
+        COMMIT_BOOST_IMAGE_DEFAULT, CommitBoostConfig, LogsSettings, ModuleKind,
+        ModuleSigningConfig, PbsConfig, PbsModuleConfig, RelayConfig, ReverseProxyHeaderSetup,
         SIGNER_JWT_AUTH_FAIL_LIMIT_DEFAULT, SIGNER_JWT_AUTH_FAIL_TIMEOUT_SECONDS_DEFAULT,
         SIGNER_PORT_DEFAULT, SignerConfig, SignerType, StartSignerConfig, StaticModuleConfig,
         StaticPbsConfig, TlsMode,
@@ -131,7 +131,7 @@ pub fn get_signer_config(loader: SignerLoader, tls: bool) -> SignerConfig {
     SignerConfig {
         host: default_host(),
         port: SIGNER_PORT_DEFAULT,
-        docker_image: SIGNER_IMAGE_DEFAULT.to_string(),
+        docker_image: COMMIT_BOOST_IMAGE_DEFAULT.to_string(),
         jwt_auth_fail_limit: SIGNER_JWT_AUTH_FAIL_LIMIT_DEFAULT,
         jwt_auth_fail_timeout_seconds: SIGNER_JWT_AUTH_FAIL_TIMEOUT_SECONDS_DEFAULT,
         inner: SignerType::Local { loader, store: None },