diff --git a/operator/src/network/ceramic.rs b/operator/src/network/ceramic.rs index 9285bdd9..c30597f2 100644 --- a/operator/src/network/ceramic.rs +++ b/operator/src/network/ceramic.rs @@ -1,4 +1,4 @@ -use std::collections::BTreeMap; +use std::collections::{BTreeMap, HashMap}; use k8s_openapi::{ api::{ @@ -268,6 +268,7 @@ pub struct RustIpfsConfig { image_pull_policy: String, resource_limits: ResourceLimitsConfig, rust_log: String, + env: Option>, } impl Default for RustIpfsConfig { @@ -281,6 +282,7 @@ impl Default for RustIpfsConfig { storage: Quantity("1Gi".to_owned()), }, rust_log: "info,ceramic_one=debug,tracing_actix_web=debug".to_owned(), + env: None, } } } @@ -295,6 +297,7 @@ impl From for RustIpfsConfig { default.resource_limits, ), rust_log: value.rust_log.unwrap_or(default.rust_log), + env: value.env, } } } @@ -391,51 +394,66 @@ impl From for IpfsConfig { impl RustIpfsConfig { fn container(&self) -> Container { - Container { - env: Some(vec![ - EnvVar { - name: "RUST_LOG".to_owned(), - value: Some(self.rust_log.to_owned()), - ..Default::default() - }, - EnvVar { - name: "CERAMIC_ONE_BIND_ADDRESS".to_owned(), - value: Some(format!("0.0.0.0:{CERAMIC_SERVICE_IPFS_PORT}")), - ..Default::default() - }, - EnvVar { - name: "CERAMIC_ONE_METRICS".to_owned(), - value: Some("true".to_owned()), - ..Default::default() - }, - EnvVar { - name: "CERAMIC_ONE_METRICS_BIND_ADDRESS".to_owned(), - value: Some("0.0.0.0:9090".to_owned()), - ..Default::default() - }, - EnvVar { - name: "CERAMIC_ONE_SWARM_ADDRESSES".to_owned(), - value: Some("/ip4/0.0.0.0/tcp/4001".to_owned()), - ..Default::default() - }, - EnvVar { - name: "CERAMIC_ONE_STORE_DIR".to_owned(), - value: Some("/data/ipfs".to_owned()), - ..Default::default() - }, - EnvVar { - name: "CERAMIC_ONE_NETWORK".to_owned(), - value: Some("local".to_owned()), - ..Default::default() - }, - EnvVar { - name: "CERAMIC_ONE_LOCAL_NETWORK_ID".to_owned(), - // We can use a hard coded value since nodes from other networks should not be - // able to connect. - value: Some("0".to_owned()), + let mut env = vec![ + EnvVar { + name: "RUST_LOG".to_owned(), + value: Some(self.rust_log.to_owned()), + ..Default::default() + }, + EnvVar { + name: "CERAMIC_ONE_BIND_ADDRESS".to_owned(), + value: Some(format!("0.0.0.0:{CERAMIC_SERVICE_IPFS_PORT}")), + ..Default::default() + }, + EnvVar { + name: "CERAMIC_ONE_METRICS".to_owned(), + value: Some("true".to_owned()), + ..Default::default() + }, + EnvVar { + name: "CERAMIC_ONE_METRICS_BIND_ADDRESS".to_owned(), + value: Some("0.0.0.0:9090".to_owned()), + ..Default::default() + }, + EnvVar { + name: "CERAMIC_ONE_SWARM_ADDRESSES".to_owned(), + value: Some("/ip4/0.0.0.0/tcp/4001".to_owned()), + ..Default::default() + }, + EnvVar { + name: "CERAMIC_ONE_STORE_DIR".to_owned(), + value: Some("/data/ipfs".to_owned()), + ..Default::default() + }, + EnvVar { + name: "CERAMIC_ONE_NETWORK".to_owned(), + value: Some("local".to_owned()), + ..Default::default() + }, + EnvVar { + name: "CERAMIC_ONE_LOCAL_NETWORK_ID".to_owned(), + // We can use a hard coded value since nodes from other networks should not be + // able to connect. + value: Some("0".to_owned()), + ..Default::default() + }, + ]; + if let Some(extra_env) = &self.env { + extra_env.iter().for_each(|(key, value)| { + if let Some((pos, _)) = env.iter().enumerate().find(|(_, var)| &var.name == key) { + env.swap_remove(pos); + } + env.push(EnvVar { + name: key.to_string(), + value: Some(value.to_string()), ..Default::default() - }, - ]), + }) + }); + } + // Sort env vars so we can have stable tests + env.sort_unstable_by(|a, b| a.name.cmp(&b.name)); + Container { + env: Some(env), image: Some(self.image.to_owned()), image_pull_policy: Some(self.image_pull_policy.to_owned()), name: IPFS_CONTAINER_NAME.to_owned(), diff --git a/operator/src/network/controller.rs b/operator/src/network/controller.rs index 98f5d635..fba6adb9 100644 --- a/operator/src/network/controller.rs +++ b/operator/src/network/controller.rs @@ -765,8 +765,8 @@ async fn reset_bootstrap_job( // Stub tests relying on stub.rs and its apiserver stubs #[cfg(test)] mod tests { - use std::sync::Arc; use std::{collections::BTreeMap, time::Duration}; + use std::{collections::HashMap, sync::Arc}; use super::{reconcile, Network}; @@ -1780,14 +1780,14 @@ mod tests { { - "env": [ - { - - "name": "RUST_LOG", - - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - - }, - - { - "name": "CERAMIC_ONE_BIND_ADDRESS", - "value": "0.0.0.0:5001" - }, - { + - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + - "value": "0" + - }, + - { - "name": "CERAMIC_ONE_METRICS", - "value": "true" - }, @@ -1796,20 +1796,20 @@ mod tests { - "value": "0.0.0.0:9090" - }, - { - - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - - "value": "/ip4/0.0.0.0/tcp/4001" + - "name": "CERAMIC_ONE_NETWORK", + - "value": "local" - }, - { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" - }, - { - - "name": "CERAMIC_ONE_NETWORK", - - "value": "local" + - "name": "CERAMIC_ONE_SWARM_ADDRESSES", + - "value": "/ip4/0.0.0.0/tcp/4001" - }, - { - - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - - "value": "0" + - "name": "RUST_LOG", + - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - } - ], - "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -1905,14 +1905,14 @@ mod tests { { - "env": [ - { - - "name": "RUST_LOG", - - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - - }, - - { - "name": "CERAMIC_ONE_BIND_ADDRESS", - "value": "0.0.0.0:5001" - }, - { + - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + - "value": "0" + - }, + - { - "name": "CERAMIC_ONE_METRICS", - "value": "true" - }, @@ -1921,20 +1921,20 @@ mod tests { - "value": "0.0.0.0:9090" - }, - { - - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - - "value": "/ip4/0.0.0.0/tcp/4001" + - "name": "CERAMIC_ONE_NETWORK", + - "value": "local" - }, - { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" - }, - { - - "name": "CERAMIC_ONE_NETWORK", - - "value": "local" + - "name": "CERAMIC_ONE_SWARM_ADDRESSES", + - "value": "/ip4/0.0.0.0/tcp/4001" - }, - { - - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - - "value": "0" + - "name": "RUST_LOG", + - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - } - ], - "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -2049,14 +2049,14 @@ mod tests { { - "env": [ - { - - "name": "RUST_LOG", - - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - - }, - - { - "name": "CERAMIC_ONE_BIND_ADDRESS", - "value": "0.0.0.0:5001" - }, - { + - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + - "value": "0" + - }, + - { - "name": "CERAMIC_ONE_METRICS", - "value": "true" - }, @@ -2065,20 +2065,20 @@ mod tests { - "value": "0.0.0.0:9090" - }, - { - - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - - "value": "/ip4/0.0.0.0/tcp/4001" + - "name": "CERAMIC_ONE_NETWORK", + - "value": "local" - }, - { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" - }, - { - - "name": "CERAMIC_ONE_NETWORK", - - "value": "local" + - "name": "CERAMIC_ONE_SWARM_ADDRESSES", + - "value": "/ip4/0.0.0.0/tcp/4001" - }, - { - - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - - "value": "0" + - "name": "RUST_LOG", + - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - } - ], - "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -2141,6 +2141,12 @@ mod tests { memory: Some(Quantity("4Gi".to_owned())), storage: Some(Quantity("4Gi".to_owned())), }), + env: Some(HashMap::from_iter([ + ("ENV_KEY_A".to_string(), "ENV_VALUE_A".to_string()), + ("ENV_KEY_B".to_string(), "ENV_VALUE_B".to_string()), + // Override one existing var + ("CERAMIC_ONE_METRICS".to_string(), "false".to_string()), + ])), ..Default::default() })), ..Default::default() @@ -2170,8 +2176,29 @@ mod tests { stub.ceramics[0].stateful_set.patch(expect![[r#" --- original +++ modified - @@ -171,7 +171,7 @@ - "value": "0" + @@ -148,7 +148,7 @@ + }, + { + "name": "CERAMIC_ONE_METRICS", + - "value": "true" + + "value": "false" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + @@ -167,11 +167,19 @@ + "value": "/ip4/0.0.0.0/tcp/4001" + }, + { + + "name": "ENV_KEY_A", + + "value": "ENV_VALUE_A" + + }, + + { + + "name": "ENV_KEY_B", + + "value": "ENV_VALUE_B" + + }, + + { + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], - "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -2179,7 +2206,7 @@ mod tests { "imagePullPolicy": "Always", "name": "ipfs", "ports": [ - @@ -193,14 +193,14 @@ + @@ -193,14 +201,14 @@ ], "resources": { "limits": { diff --git a/operator/src/network/spec.rs b/operator/src/network/spec.rs index 89a9e53e..67942b05 100644 --- a/operator/src/network/spec.rs +++ b/operator/src/network/spec.rs @@ -1,4 +1,5 @@ //! Place all spec types into a single module so they can be used as a lightweight dependency +use std::collections::HashMap; use k8s_openapi::apimachinery::pkg::api::resource::Quantity; use keramik_common::peer_info::Peer; @@ -119,6 +120,9 @@ pub struct RustIpfsSpec { pub resource_limits: Option, /// Value of the RUST_LOG env var. pub rust_log: Option, + /// Extra env values to pass to the image. + /// CAUTION: Any env vars specified in this set will override any predefined values. + pub env: Option>, } /// Describes how the Go IPFS node for a peer should behave. diff --git a/operator/src/network/testdata/ceramic_ss_1 b/operator/src/network/testdata/ceramic_ss_1 index 4631cb8d..bdef3261 100644 --- a/operator/src/network/testdata/ceramic_ss_1 +++ b/operator/src/network/testdata/ceramic_ss_1 @@ -138,14 +138,14 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, + { + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, { "name": "CERAMIC_ONE_METRICS", "value": "true" @@ -155,20 +155,20 @@ Request { "value": "0.0.0.0:9090" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_NETWORK", + "value": "local" }, { "name": "CERAMIC_ONE_STORE_DIR", "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_0 b/operator/src/network/testdata/ceramic_ss_weighted_0 index 8ea2e19e..dd1e177e 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_0 +++ b/operator/src/network/testdata/ceramic_ss_weighted_0 @@ -138,14 +138,14 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, + { + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, { "name": "CERAMIC_ONE_METRICS", "value": "true" @@ -155,20 +155,20 @@ Request { "value": "0.0.0.0:9090" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_NETWORK", + "value": "local" }, { "name": "CERAMIC_ONE_STORE_DIR", "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_1 b/operator/src/network/testdata/ceramic_ss_weighted_1 index a4e99614..1f5a3b7f 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_1 +++ b/operator/src/network/testdata/ceramic_ss_weighted_1 @@ -138,14 +138,14 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, + { + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, { "name": "CERAMIC_ONE_METRICS", "value": "true" @@ -155,20 +155,20 @@ Request { "value": "0.0.0.0:9090" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_NETWORK", + "value": "local" }, { "name": "CERAMIC_ONE_STORE_DIR", "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_2 b/operator/src/network/testdata/ceramic_ss_weighted_2 index 3b2882c1..7b339b70 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_2 +++ b/operator/src/network/testdata/ceramic_ss_weighted_2 @@ -138,14 +138,14 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, + { + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, { "name": "CERAMIC_ONE_METRICS", "value": "true" @@ -155,20 +155,20 @@ Request { "value": "0.0.0.0:9090" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_NETWORK", + "value": "local" }, { "name": "CERAMIC_ONE_STORE_DIR", "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_3 b/operator/src/network/testdata/ceramic_ss_weighted_3 index ca6fb2ee..7d772bde 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_3 +++ b/operator/src/network/testdata/ceramic_ss_weighted_3 @@ -138,14 +138,14 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, + { + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, { "name": "CERAMIC_ONE_METRICS", "value": "true" @@ -155,20 +155,20 @@ Request { "value": "0.0.0.0:9090" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_NETWORK", + "value": "local" }, { "name": "CERAMIC_ONE_STORE_DIR", "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_4 b/operator/src/network/testdata/ceramic_ss_weighted_4 index 77e0586f..e3c09257 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_4 +++ b/operator/src/network/testdata/ceramic_ss_weighted_4 @@ -138,14 +138,14 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, + { + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, { "name": "CERAMIC_ONE_METRICS", "value": "true" @@ -155,20 +155,20 @@ Request { "value": "0.0.0.0:9090" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_NETWORK", + "value": "local" }, { "name": "CERAMIC_ONE_STORE_DIR", "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_5 b/operator/src/network/testdata/ceramic_ss_weighted_5 index 6d209fc8..087411b4 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_5 +++ b/operator/src/network/testdata/ceramic_ss_weighted_5 @@ -138,14 +138,14 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, + { + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, { "name": "CERAMIC_ONE_METRICS", "value": "true" @@ -155,20 +155,20 @@ Request { "value": "0.0.0.0:9090" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_NETWORK", + "value": "local" }, { "name": "CERAMIC_ONE_STORE_DIR", "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_6 b/operator/src/network/testdata/ceramic_ss_weighted_6 index f2e7dd29..52f7c1dd 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_6 +++ b/operator/src/network/testdata/ceramic_ss_weighted_6 @@ -138,14 +138,14 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, + { + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, { "name": "CERAMIC_ONE_METRICS", "value": "true" @@ -155,20 +155,20 @@ Request { "value": "0.0.0.0:9090" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_NETWORK", + "value": "local" }, { "name": "CERAMIC_ONE_STORE_DIR", "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_7 b/operator/src/network/testdata/ceramic_ss_weighted_7 index c7db493a..f939e60b 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_7 +++ b/operator/src/network/testdata/ceramic_ss_weighted_7 @@ -138,14 +138,14 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, + { + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, { "name": "CERAMIC_ONE_METRICS", "value": "true" @@ -155,20 +155,20 @@ Request { "value": "0.0.0.0:9090" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_NETWORK", + "value": "local" }, { "name": "CERAMIC_ONE_STORE_DIR", "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_8 b/operator/src/network/testdata/ceramic_ss_weighted_8 index 778ea27f..fd75d69d 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_8 +++ b/operator/src/network/testdata/ceramic_ss_weighted_8 @@ -138,14 +138,14 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, + { + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, { "name": "CERAMIC_ONE_METRICS", "value": "true" @@ -155,20 +155,20 @@ Request { "value": "0.0.0.0:9090" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_NETWORK", + "value": "local" }, { "name": "CERAMIC_ONE_STORE_DIR", "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_9 b/operator/src/network/testdata/ceramic_ss_weighted_9 index 62967bd2..4deb7a7b 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_9 +++ b/operator/src/network/testdata/ceramic_ss_weighted_9 @@ -138,14 +138,14 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, + { + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, { "name": "CERAMIC_ONE_METRICS", "value": "true" @@ -155,20 +155,20 @@ Request { "value": "0.0.0.0:9090" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_NETWORK", + "value": "local" }, { "name": "CERAMIC_ONE_STORE_DIR", "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", diff --git a/operator/src/network/testdata/default_stubs/ceramic_stateful_set b/operator/src/network/testdata/default_stubs/ceramic_stateful_set index 43912c67..fe2061fd 100644 --- a/operator/src/network/testdata/default_stubs/ceramic_stateful_set +++ b/operator/src/network/testdata/default_stubs/ceramic_stateful_set @@ -138,14 +138,14 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,tracing_actix_web=debug" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, + { + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, { "name": "CERAMIC_ONE_METRICS", "value": "true" @@ -155,20 +155,20 @@ Request { "value": "0.0.0.0:9090" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_NETWORK", + "value": "local" }, { "name": "CERAMIC_ONE_STORE_DIR", "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,tracing_actix_web=debug" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest",