From 91601096d96c5ed455a24c9295c20b686edcf44f Mon Sep 17 00:00:00 2001 From: Nathaniel Cook Date: Tue, 17 Dec 2024 11:56:19 -0700 Subject: [PATCH] feat: expose the flight-sql port --- common/src/peer_info.rs | 2 + operator/src/network/ceramic.rs | 16 +- operator/src/network/controller.rs | 156 +++++++++++++----- operator/src/network/ipfs.rs | 8 +- .../src/network/testdata/ceramic_go_svc_1 | 5 + operator/src/network/testdata/ceramic_ss_1 | 5 + .../network/testdata/ceramic_ss_weighted_0 | 5 + .../network/testdata/ceramic_ss_weighted_1 | 5 + .../network/testdata/ceramic_ss_weighted_2 | 5 + .../network/testdata/ceramic_ss_weighted_3 | 5 + .../network/testdata/ceramic_ss_weighted_4 | 5 + .../network/testdata/ceramic_ss_weighted_5 | 5 + .../network/testdata/ceramic_ss_weighted_6 | 5 + .../network/testdata/ceramic_ss_weighted_7 | 5 + .../network/testdata/ceramic_ss_weighted_8 | 5 + .../network/testdata/ceramic_ss_weighted_9 | 5 + operator/src/network/testdata/ceramic_svc_1 | 5 + .../network/testdata/ceramic_svc_weighted_0 | 5 + .../network/testdata/ceramic_svc_weighted_1 | 5 + .../network/testdata/ceramic_svc_weighted_2 | 5 + .../network/testdata/ceramic_svc_weighted_3 | 5 + .../network/testdata/ceramic_svc_weighted_4 | 5 + .../network/testdata/ceramic_svc_weighted_5 | 5 + .../network/testdata/ceramic_svc_weighted_6 | 5 + .../network/testdata/ceramic_svc_weighted_7 | 5 + .../network/testdata/ceramic_svc_weighted_8 | 5 + .../network/testdata/ceramic_svc_weighted_9 | 5 + .../network/testdata/ceramic_weighted_peers | 2 +- .../network/testdata/ceramics_weighted_status | 20 +++ .../default_stubs/cas_ipfs_stateful_set | 5 + .../testdata/default_stubs/ceramic_service | 5 + .../default_stubs/ceramic_stateful_set | 5 + operator/src/simulation/controller.rs | 3 + operator/src/simulation/stub.rs | 2 + runner/src/simulate.rs | 2 + 35 files changed, 294 insertions(+), 47 deletions(-) diff --git a/common/src/peer_info.rs b/common/src/peer_info.rs index faa7a81e..8c9e8246 100644 --- a/common/src/peer_info.rs +++ b/common/src/peer_info.rs @@ -57,6 +57,8 @@ pub struct CeramicPeerInfo { pub ipfs_rpc_addr: String, /// Ceramic API address of the peer. pub ceramic_addr: String, + /// Flight SQL API address of the peer. + pub flight_addr: String, /// Set of p2p addresses of the peer. /// Each address contains the /p2p/ protocol. pub p2p_addrs: Vec, diff --git a/operator/src/network/ceramic.rs b/operator/src/network/ceramic.rs index b2998704..87c28ff7 100644 --- a/operator/src/network/ceramic.rs +++ b/operator/src/network/ceramic.rs @@ -34,7 +34,8 @@ use crate::{ }; use super::{ - controller::CERAMIC_ONE_SWARM_PORT, debug_mode_security_context, + controller::{CERAMIC_ONE_FLIGHT_SQL_PORT, CERAMIC_ONE_SWARM_PORT}, + debug_mode_security_context, storage::PersistentStorageConfig, }; @@ -124,6 +125,12 @@ pub fn service_spec() -> ServiceSpec { protocol: Some("TCP".to_owned()), ..Default::default() }, + ServicePort { + port: CERAMIC_ONE_FLIGHT_SQL_PORT, + name: Some("flight".to_owned()), + protocol: Some("TCP".to_owned()), + ..Default::default() + }, ServicePort { port: CERAMIC_ONE_SWARM_PORT, name: Some("swarm-tcp".to_owned()), @@ -251,6 +258,13 @@ impl CeramicInfo { self.stateful_set, self.service ) } + /// Determine the Flight SQL address of a Ceramic peer + pub fn flight_addr(&self, ns: &str, peer: i32) -> String { + format!( + "http://{}-{peer}.{}.{ns}.svc.cluster.local:{CERAMIC_ONE_FLIGHT_SQL_PORT}", + self.stateful_set, self.service + ) + } } impl From<&CeramicInfo> for IpfsInfo { diff --git a/operator/src/network/controller.rs b/operator/src/network/controller.rs index 2e2de3ad..7896ca4c 100644 --- a/operator/src/network/controller.rs +++ b/operator/src/network/controller.rs @@ -73,6 +73,7 @@ pub const PEERS_CONFIG_MAP_NAME: &str = "keramik-peers"; pub const CERAMIC_ONE_SWARM_PORT: i32 = 4101; pub const CERAMIC_ONE_IPFS_PORT: i32 = 5101; +pub const CERAMIC_ONE_FLIGHT_SQL_PORT: i32 = 5102; pub const CERAMIC_SERVICE_API_PORT: i32 = 7007; pub const CERAMIC_POSTGRES_SECRET_NAME: &str = "ceramic-postgres-auth"; @@ -868,6 +869,7 @@ async fn update_peer_status( continue; } let ipfs_rpc_addr = ceramic.info.ipfs_rpc_addr(ns, i); + let flight_addr = ceramic.info.flight_addr(ns, i); let info = match cx.rpc_client.peer_info(&ipfs_rpc_addr).await { Ok(res) => res, Err(err) => { @@ -881,6 +883,7 @@ async fn update_peer_status( peer_id: info.peer_id, ipfs_rpc_addr: info.ipfs_rpc_addr, p2p_addrs: info.p2p_addrs, + flight_addr, })); } } @@ -1323,7 +1326,7 @@ mod tests { "apiVersion": "v1", "data": { - "peers.json": "[]" - + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://peer0:5001\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[\"/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0\"]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://peer1:5001\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[\"/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1\"]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs:5001\",\"p2pAddrs\":[\"/ip4/10.0.0.3/tcp/4001/p2p/cas_peer_id\"]}}]" + + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://peer0:5001\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[\"/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0\"]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://peer1:5001\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[\"/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1\"]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs:5001\",\"p2pAddrs\":[\"/ip4/10.0.0.3/tcp/4001/p2p/cas_peer_id\"]}}]" }, "kind": "ConfigMap", "metadata": { @@ -1331,7 +1334,7 @@ mod tests { stub.status.patch(expect![[r#" --- original +++ modified - @@ -8,10 +8,40 @@ + @@ -8,10 +8,42 @@ body: { "status": { "expirationTime": null, @@ -1344,6 +1347,7 @@ mod tests { + { + "ceramic": { + "ceramicAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007", + + "flightAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102", + "ipfsRpcAddr": "http://peer0:5001", + "p2pAddrs": [ + "/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0" @@ -1354,6 +1358,7 @@ mod tests { + { + "ceramic": { + "ceramicAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007", + + "flightAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102", + "ipfsRpcAddr": "http://peer1:5001", + "p2pAddrs": [ + "/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1" @@ -1560,7 +1565,7 @@ mod tests { "apiVersion": "v1", "data": { - "peers.json": "[]" - + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://peer0:5001\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[\"/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0\"]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://peer1:5001\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[\"/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1\"]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs:5001\",\"p2pAddrs\":[\"/ip4/10.0.0.3/tcp/4001/p2p/cas_peer_id\"]}}]" + + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://peer0:5001\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[\"/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0\"]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://peer1:5001\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[\"/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1\"]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs:5001\",\"p2pAddrs\":[\"/ip4/10.0.0.3/tcp/4001/p2p/cas_peer_id\"]}}]" }, "kind": "ConfigMap", "metadata": { @@ -1568,7 +1573,7 @@ mod tests { stub.status.patch(expect![[r#" --- original +++ modified - @@ -8,10 +8,40 @@ + @@ -8,10 +8,42 @@ body: { "status": { "expirationTime": null, @@ -1581,6 +1586,7 @@ mod tests { + { + "ceramic": { + "ceramicAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007", + + "flightAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102", + "ipfsRpcAddr": "http://peer0:5001", + "p2pAddrs": [ + "/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0" @@ -1591,6 +1597,7 @@ mod tests { + { + "ceramic": { + "ceramicAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007", + + "flightAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102", + "ipfsRpcAddr": "http://peer1:5001", + "p2pAddrs": [ + "/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1" @@ -1709,7 +1716,7 @@ mod tests { "apiVersion": "v1", "data": { - "peers.json": "[]" - + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://peer0:5001\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[\"/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0\"]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://peer1:5001\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[\"/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1\"]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs:5001\",\"p2pAddrs\":[\"/ip4/10.0.0.3/tcp/4001/p2p/cas_peer_id\"]}}]" + + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://peer0:5001\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[\"/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0\"]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://peer1:5001\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[\"/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1\"]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs:5001\",\"p2pAddrs\":[\"/ip4/10.0.0.3/tcp/4001/p2p/cas_peer_id\"]}}]" }, "kind": "ConfigMap", "metadata": { @@ -1717,7 +1724,7 @@ mod tests { stub.status.patch(expect![[r#" --- original +++ modified - @@ -8,10 +8,40 @@ + @@ -8,10 +8,42 @@ body: { "status": { "expirationTime": null, @@ -1730,6 +1737,7 @@ mod tests { + { + "ceramic": { + "ceramicAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007", + + "flightAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102", + "ipfsRpcAddr": "http://peer0:5001", + "p2pAddrs": [ + "/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0" @@ -1740,6 +1748,7 @@ mod tests { + { + "ceramic": { + "ceramicAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007", + + "flightAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102", + "ipfsRpcAddr": "http://peer1:5001", + "p2pAddrs": [ + "/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1" @@ -1842,7 +1851,7 @@ mod tests { "apiVersion": "v1", "data": { - "peers.json": "[]" - + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://peer0:5001\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[\"/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0\"]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://peer1:5001\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[\"/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1\"]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs:5001\",\"p2pAddrs\":[\"/ip4/10.0.0.3/tcp/4001/p2p/cas_peer_id\"]}}]" + + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://peer0:5001\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[\"/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0\"]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://peer1:5001\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[\"/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1\"]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs:5001\",\"p2pAddrs\":[\"/ip4/10.0.0.3/tcp/4001/p2p/cas_peer_id\"]}}]" }, "kind": "ConfigMap", "metadata": { @@ -1850,7 +1859,7 @@ mod tests { stub.status.patch(expect![[r#" --- original +++ modified - @@ -8,10 +8,40 @@ + @@ -8,10 +8,42 @@ body: { "status": { "expirationTime": null, @@ -1863,6 +1872,7 @@ mod tests { + { + "ceramic": { + "ceramicAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007", + + "flightAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102", + "ipfsRpcAddr": "http://peer0:5001", + "p2pAddrs": [ + "/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0" @@ -1873,6 +1883,7 @@ mod tests { + { + "ceramic": { + "ceramicAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007", + + "flightAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102", + "ipfsRpcAddr": "http://peer1:5001", + "p2pAddrs": [ + "/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1" @@ -1979,7 +1990,7 @@ mod tests { "apiVersion": "v1", "data": { - "peers.json": "[]" - + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://peer0:5001\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[\"/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0\"]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://peer1:5001\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[\"/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1\"]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs:5001\",\"p2pAddrs\":[\"/ip4/10.0.0.3/tcp/4001/p2p/cas_peer_id\"]}}]" + + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://peer0:5001\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[\"/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0\"]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://peer1:5001\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[\"/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1\"]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs:5001\",\"p2pAddrs\":[\"/ip4/10.0.0.3/tcp/4001/p2p/cas_peer_id\"]}}]" }, "kind": "ConfigMap", "metadata": { @@ -1987,7 +1998,7 @@ mod tests { stub.status.patch(expect![[r#" --- original +++ modified - @@ -8,10 +8,40 @@ + @@ -8,10 +8,42 @@ body: { "status": { "expirationTime": null, @@ -2000,6 +2011,7 @@ mod tests { + { + "ceramic": { + "ceramicAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007", + + "flightAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102", + "ipfsRpcAddr": "http://peer0:5001", + "p2pAddrs": [ + "/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0" @@ -2010,6 +2022,7 @@ mod tests { + { + "ceramic": { + "ceramicAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007", + + "flightAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102", + "ipfsRpcAddr": "http://peer1:5001", + "p2pAddrs": [ + "/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1" @@ -2109,7 +2122,7 @@ mod tests { "apiVersion": "v1", "data": { - "peers.json": "[]" - + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://peer0:5001\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[\"/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0\"]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://peer1:5001\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[\"/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1\"]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs:5001\",\"p2pAddrs\":[\"/ip4/10.0.0.3/tcp/4001/p2p/cas_peer_id\"]}}]" + + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://peer0:5001\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[\"/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0\"]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://peer1:5001\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[\"/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1\"]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs:5001\",\"p2pAddrs\":[\"/ip4/10.0.0.3/tcp/4001/p2p/cas_peer_id\"]}}]" }, "kind": "ConfigMap", "metadata": { @@ -2117,7 +2130,7 @@ mod tests { stub.status.patch(expect![[r#" --- original +++ modified - @@ -8,10 +8,40 @@ + @@ -8,10 +8,42 @@ body: { "status": { "expirationTime": null, @@ -2130,6 +2143,7 @@ mod tests { + { + "ceramic": { + "ceramicAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007", + + "flightAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102", + "ipfsRpcAddr": "http://peer0:5001", + "p2pAddrs": [ + "/ip4/10.0.0.1/tcp/4001/p2p/peer_id_0" @@ -2140,6 +2154,7 @@ mod tests { + { + "ceramic": { + "ceramicAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007", + + "flightAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102", + "ipfsRpcAddr": "http://peer1:5001", + "p2pAddrs": [ + "/ip4/10.0.0.2/tcp/4001/p2p/peer_id_1" @@ -2322,7 +2337,19 @@ mod tests { "name": "ipfs", "ports": [ { - @@ -282,14 +240,14 @@ + @@ -275,11 +233,6 @@ + "protocol": "TCP" + }, + { + - "containerPort": 5102, + - "name": "flight", + - "protocol": "TCP" + - }, + - { + "containerPort": 9465, + "name": "metrics", + "protocol": "TCP" + @@ -287,14 +240,14 @@ ], "resources": { "limits": { @@ -2341,7 +2368,7 @@ mod tests { } }, "volumeMounts": [ - @@ -296,6 +254,11 @@ + @@ -301,6 +254,11 @@ { "mountPath": "/data/ipfs", "name": "ipfs-data" @@ -2353,7 +2380,7 @@ mod tests { } ] } - @@ -435,6 +398,13 @@ + @@ -440,6 +398,13 @@ "persistentVolumeClaim": { "claimName": "postgres-data" } @@ -2478,7 +2505,19 @@ mod tests { "name": "ipfs", "ports": [ { - @@ -282,14 +240,14 @@ + @@ -275,11 +233,6 @@ + "protocol": "TCP" + }, + { + - "containerPort": 5102, + - "name": "flight", + - "protocol": "TCP" + - }, + - { + "containerPort": 9465, + "name": "metrics", + "protocol": "TCP" + @@ -287,14 +240,14 @@ ], "resources": { "limits": { @@ -2499,7 +2538,7 @@ mod tests { } }, "volumeMounts": [ - @@ -296,6 +254,11 @@ + @@ -301,6 +254,11 @@ { "mountPath": "/data/ipfs", "name": "ipfs-data" @@ -2511,7 +2550,7 @@ mod tests { } ] } - @@ -435,6 +398,13 @@ + @@ -440,6 +398,13 @@ "persistentVolumeClaim": { "claimName": "postgres-data" } @@ -2525,7 +2564,7 @@ mod tests { } ] } - @@ -474,7 +444,7 @@ + @@ -479,7 +444,7 @@ ], "resources": { "requests": { @@ -2639,7 +2678,19 @@ mod tests { "name": "ipfs", "ports": [ { - @@ -282,14 +240,14 @@ + @@ -275,11 +233,6 @@ + "protocol": "TCP" + }, + { + - "containerPort": 5102, + - "name": "flight", + - "protocol": "TCP" + - }, + - { + "containerPort": 9465, + "name": "metrics", + "protocol": "TCP" + @@ -287,14 +240,14 @@ ], "resources": { "limits": { @@ -2658,7 +2709,7 @@ mod tests { } }, "volumeMounts": [ - @@ -296,6 +254,16 @@ + @@ -301,6 +254,16 @@ { "mountPath": "/data/ipfs", "name": "ipfs-data" @@ -2675,7 +2726,7 @@ mod tests { } ] } - @@ -435,6 +403,13 @@ + @@ -440,6 +403,13 @@ "persistentVolumeClaim": { "claimName": "postgres-data" } @@ -2782,7 +2833,7 @@ mod tests { "imagePullPolicy": "Always", "name": "ipfs", "ports": [ - @@ -282,14 +294,14 @@ + @@ -287,14 +299,14 @@ ], "resources": { "limits": { @@ -2803,7 +2854,7 @@ mod tests { } }, "volumeMounts": [ - @@ -474,9 +486,10 @@ + @@ -479,9 +491,10 @@ ], "resources": { "requests": { @@ -3032,7 +3083,7 @@ mod tests { stub.cas_ipfs_stateful_set.patch(expect![[r#" --- original +++ modified - @@ -99,14 +99,14 @@ + @@ -104,14 +104,14 @@ ], "resources": { "limits": { @@ -3053,7 +3104,7 @@ mod tests { } }, "volumeMounts": [ - @@ -140,9 +140,10 @@ + @@ -145,9 +145,10 @@ ], "resources": { "requests": { @@ -3210,7 +3261,7 @@ mod tests { } }, "volumeMounts": [ - @@ -381,14 +381,14 @@ + @@ -386,14 +386,14 @@ "name": "init-ceramic-config", "resources": { "limits": { @@ -3231,7 +3282,7 @@ mod tests { } }, "volumeMounts": [ - @@ -457,7 +457,7 @@ + @@ -462,7 +462,7 @@ ], "resources": { "requests": { @@ -3432,7 +3483,7 @@ mod tests { }, { "name": "CERAMIC_ONE_P2P_KEY_DIR", - @@ -319,7 +315,7 @@ + @@ -324,7 +320,7 @@ }, { "name": "CAS_API_URL", @@ -3441,7 +3492,7 @@ mod tests { }, { "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - @@ -335,11 +331,7 @@ + @@ -340,11 +336,7 @@ }, { "name": "CERAMIC_NETWORK", @@ -3454,7 +3505,7 @@ mod tests { }, { "name": "CERAMIC_SQLITE_PATH", - @@ -351,7 +343,7 @@ + @@ -356,7 +348,7 @@ }, { "name": "ETH_RPC_URL", @@ -3499,7 +3550,7 @@ mod tests { "livenessProbe": { "httpGet": { "path": "/api/v0/node/healthcheck", - @@ -377,7 +377,7 @@ + @@ -382,7 +382,7 @@ } ], "image": "ceramicnetwork/composedb-cli:latest", @@ -3914,7 +3965,7 @@ mod tests { } ], "image": "ceramicnetwork/composedb:develop", - @@ -374,6 +378,10 @@ + @@ -379,6 +383,10 @@ "name": "ceramic-postgres-auth" } } @@ -4151,7 +4202,7 @@ mod tests { stub.ceramics[0].stateful_set.patch(expect![[r#" --- original +++ modified - @@ -476,7 +476,8 @@ + @@ -481,7 +481,8 @@ "requests": { "storage": "10Gi" } @@ -4244,7 +4295,19 @@ mod tests { "name": "ipfs", "ports": [ { - @@ -282,14 +240,14 @@ + @@ -275,11 +233,6 @@ + "protocol": "TCP" + }, + { + - "containerPort": 5102, + - "name": "flight", + - "protocol": "TCP" + - }, + - { + "containerPort": 9465, + "name": "metrics", + "protocol": "TCP" + @@ -287,14 +240,14 @@ ], "resources": { "limits": { @@ -4263,7 +4326,7 @@ mod tests { } }, "volumeMounts": [ - @@ -296,6 +254,11 @@ + @@ -301,6 +254,11 @@ { "mountPath": "/data/ipfs", "name": "ipfs-data" @@ -4275,7 +4338,7 @@ mod tests { } ] } - @@ -435,6 +398,13 @@ + @@ -440,6 +398,13 @@ "persistentVolumeClaim": { "claimName": "postgres-data" } @@ -4289,7 +4352,7 @@ mod tests { } ] } - @@ -476,7 +446,8 @@ + @@ -481,7 +446,8 @@ "requests": { "storage": "10Gi" } @@ -4574,7 +4637,7 @@ mod tests { "name": "RUST_LOG", "value": "info,ceramic_one=debug,multipart=error" } - @@ -278,6 +298,11 @@ + @@ -283,6 +303,11 @@ "containerPort": 9465, "name": "metrics", "protocol": "TCP" @@ -4586,7 +4649,7 @@ mod tests { } ], "resources": { - @@ -292,6 +317,13 @@ + @@ -297,6 +322,13 @@ "memory": "1Gi" } }, @@ -4600,7 +4663,7 @@ mod tests { "volumeMounts": [ { "mountPath": "/data/ipfs", - @@ -354,6 +386,10 @@ + @@ -359,6 +391,10 @@ "value": "http://ganache:8545" }, { @@ -4626,7 +4689,7 @@ mod tests { "name": "RUST_LOG", "value": "info,ceramic_one=debug,multipart=error" } - @@ -95,6 +99,11 @@ + @@ -100,6 +104,11 @@ "containerPort": 9465, "name": "metrics", "protocol": "TCP" @@ -4638,7 +4701,7 @@ mod tests { } ], "resources": { - @@ -109,6 +118,13 @@ + @@ -114,6 +123,13 @@ "memory": "1Gi" } }, @@ -4842,7 +4905,7 @@ mod tests { stub.ceramics[0].stateful_set.patch(expect![[r#" --- original +++ modified - @@ -401,6 +401,99 @@ + @@ -406,6 +406,104 @@ "name": "ceramic-init" } ] @@ -4916,6 +4979,11 @@ mod tests { + "protocol": "TCP" + }, + { + + "containerPort": 5102, + + "name": "flight", + + "protocol": "TCP" + + }, + + { + "containerPort": 9465, + "name": "metrics", + "protocol": "TCP" diff --git a/operator/src/network/ipfs.rs b/operator/src/network/ipfs.rs index beab4907..1f270bd9 100644 --- a/operator/src/network/ipfs.rs +++ b/operator/src/network/ipfs.rs @@ -22,7 +22,7 @@ use crate::{ }; use super::{ - controller::{CERAMIC_ONE_IPFS_PORT, CERAMIC_ONE_SWARM_PORT}, + controller::{CERAMIC_ONE_FLIGHT_SQL_PORT, CERAMIC_ONE_IPFS_PORT, CERAMIC_ONE_SWARM_PORT}, debug_mode_security_context, }; @@ -243,6 +243,12 @@ impl RustIpfsConfig { protocol: Some("TCP".to_owned()), ..Default::default() }, + ContainerPort { + container_port: CERAMIC_ONE_FLIGHT_SQL_PORT, + name: Some("flight".to_owned()), + protocol: Some("TCP".to_owned()), + ..Default::default() + }, ContainerPort { container_port: 9465, name: Some("metrics".to_owned()), diff --git a/operator/src/network/testdata/ceramic_go_svc_1 b/operator/src/network/testdata/ceramic_go_svc_1 index d4d5fe5c..fa4b00d6 100644 --- a/operator/src/network/testdata/ceramic_go_svc_1 +++ b/operator/src/network/testdata/ceramic_go_svc_1 @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/ceramic_ss_1 b/operator/src/network/testdata/ceramic_ss_1 index 81e4f3d6..89b27b73 100644 --- a/operator/src/network/testdata/ceramic_ss_1 +++ b/operator/src/network/testdata/ceramic_ss_1 @@ -274,6 +274,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_0 b/operator/src/network/testdata/ceramic_ss_weighted_0 index 687d89ca..e1a29ac4 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_0 +++ b/operator/src/network/testdata/ceramic_ss_weighted_0 @@ -274,6 +274,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_1 b/operator/src/network/testdata/ceramic_ss_weighted_1 index 4cc59782..a910c62e 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_1 +++ b/operator/src/network/testdata/ceramic_ss_weighted_1 @@ -274,6 +274,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_2 b/operator/src/network/testdata/ceramic_ss_weighted_2 index 52d49e03..92fb69aa 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_2 +++ b/operator/src/network/testdata/ceramic_ss_weighted_2 @@ -274,6 +274,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_3 b/operator/src/network/testdata/ceramic_ss_weighted_3 index b08ece41..54ecd422 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_3 +++ b/operator/src/network/testdata/ceramic_ss_weighted_3 @@ -274,6 +274,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_4 b/operator/src/network/testdata/ceramic_ss_weighted_4 index 1f48bfb5..8d6f6bcf 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_4 +++ b/operator/src/network/testdata/ceramic_ss_weighted_4 @@ -274,6 +274,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_5 b/operator/src/network/testdata/ceramic_ss_weighted_5 index e98e95fc..7e92f4b1 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_5 +++ b/operator/src/network/testdata/ceramic_ss_weighted_5 @@ -274,6 +274,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_6 b/operator/src/network/testdata/ceramic_ss_weighted_6 index 22418795..c855265f 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_6 +++ b/operator/src/network/testdata/ceramic_ss_weighted_6 @@ -274,6 +274,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_7 b/operator/src/network/testdata/ceramic_ss_weighted_7 index 3a8600f0..2daa452a 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_7 +++ b/operator/src/network/testdata/ceramic_ss_weighted_7 @@ -274,6 +274,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_8 b/operator/src/network/testdata/ceramic_ss_weighted_8 index 9cf1e20f..dd3f1ef1 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_8 +++ b/operator/src/network/testdata/ceramic_ss_weighted_8 @@ -274,6 +274,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_9 b/operator/src/network/testdata/ceramic_ss_weighted_9 index 97d5e76d..b911a97f 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_9 +++ b/operator/src/network/testdata/ceramic_ss_weighted_9 @@ -274,6 +274,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/network/testdata/ceramic_svc_1 b/operator/src/network/testdata/ceramic_svc_1 index d4d5fe5c..fa4b00d6 100644 --- a/operator/src/network/testdata/ceramic_svc_1 +++ b/operator/src/network/testdata/ceramic_svc_1 @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/ceramic_svc_weighted_0 b/operator/src/network/testdata/ceramic_svc_weighted_0 index 93a5168a..eecc0af1 100644 --- a/operator/src/network/testdata/ceramic_svc_weighted_0 +++ b/operator/src/network/testdata/ceramic_svc_weighted_0 @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/ceramic_svc_weighted_1 b/operator/src/network/testdata/ceramic_svc_weighted_1 index d4d5fe5c..fa4b00d6 100644 --- a/operator/src/network/testdata/ceramic_svc_weighted_1 +++ b/operator/src/network/testdata/ceramic_svc_weighted_1 @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/ceramic_svc_weighted_2 b/operator/src/network/testdata/ceramic_svc_weighted_2 index 2710ca46..2c72a711 100644 --- a/operator/src/network/testdata/ceramic_svc_weighted_2 +++ b/operator/src/network/testdata/ceramic_svc_weighted_2 @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/ceramic_svc_weighted_3 b/operator/src/network/testdata/ceramic_svc_weighted_3 index 1056510e..1ff043d8 100644 --- a/operator/src/network/testdata/ceramic_svc_weighted_3 +++ b/operator/src/network/testdata/ceramic_svc_weighted_3 @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/ceramic_svc_weighted_4 b/operator/src/network/testdata/ceramic_svc_weighted_4 index b0eb9231..7d653d3a 100644 --- a/operator/src/network/testdata/ceramic_svc_weighted_4 +++ b/operator/src/network/testdata/ceramic_svc_weighted_4 @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/ceramic_svc_weighted_5 b/operator/src/network/testdata/ceramic_svc_weighted_5 index 7ec4a387..832f2c47 100644 --- a/operator/src/network/testdata/ceramic_svc_weighted_5 +++ b/operator/src/network/testdata/ceramic_svc_weighted_5 @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/ceramic_svc_weighted_6 b/operator/src/network/testdata/ceramic_svc_weighted_6 index 450d02b3..e612d57a 100644 --- a/operator/src/network/testdata/ceramic_svc_weighted_6 +++ b/operator/src/network/testdata/ceramic_svc_weighted_6 @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/ceramic_svc_weighted_7 b/operator/src/network/testdata/ceramic_svc_weighted_7 index 7eafdf50..357f0d46 100644 --- a/operator/src/network/testdata/ceramic_svc_weighted_7 +++ b/operator/src/network/testdata/ceramic_svc_weighted_7 @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/ceramic_svc_weighted_8 b/operator/src/network/testdata/ceramic_svc_weighted_8 index ab6c8d5c..4aa27554 100644 --- a/operator/src/network/testdata/ceramic_svc_weighted_8 +++ b/operator/src/network/testdata/ceramic_svc_weighted_8 @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/ceramic_svc_weighted_9 b/operator/src/network/testdata/ceramic_svc_weighted_9 index 78972610..240bc1c9 100644 --- a/operator/src/network/testdata/ceramic_svc_weighted_9 +++ b/operator/src/network/testdata/ceramic_svc_weighted_9 @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/ceramic_weighted_peers b/operator/src/network/testdata/ceramic_weighted_peers index e07bbc64..44cd4d47 100644 --- a/operator/src/network/testdata/ceramic_weighted_peers +++ b/operator/src/network/testdata/ceramic_weighted_peers @@ -8,7 +8,7 @@ Request { body: { "apiVersion": "v1", "data": { - "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_2\",\"ipfsRpcAddr\":\"http://ceramic-0-2.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-2.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_3\",\"ipfsRpcAddr\":\"http://ceramic-0-3.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-3.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_4\",\"ipfsRpcAddr\":\"http://ceramic-0-4.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-4.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_5\",\"ipfsRpcAddr\":\"http://ceramic-0-5.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-5.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_6\",\"ipfsRpcAddr\":\"http://ceramic-0-6.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-6.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_7\",\"ipfsRpcAddr\":\"http://ceramic-0-7.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-7.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_8\",\"ipfsRpcAddr\":\"http://ceramic-0-8.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-8.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_9\",\"ipfsRpcAddr\":\"http://ceramic-0-9.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-9.ceramic-0.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_10\",\"ipfsRpcAddr\":\"http://ceramic-1-0.ceramic-1.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-1-0.ceramic-1.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_11\",\"ipfsRpcAddr\":\"http://ceramic-1-1.ceramic-1.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-1-1.ceramic-1.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_12\",\"ipfsRpcAddr\":\"http://ceramic-2-0.ceramic-2.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-2-0.ceramic-2.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_13\",\"ipfsRpcAddr\":\"http://ceramic-3-0.ceramic-3.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-3-0.ceramic-3.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_14\",\"ipfsRpcAddr\":\"http://ceramic-4-0.ceramic-4.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-4-0.ceramic-4.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_15\",\"ipfsRpcAddr\":\"http://ceramic-5-0.ceramic-5.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-5-0.ceramic-5.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_16\",\"ipfsRpcAddr\":\"http://ceramic-6-0.ceramic-6.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-6-0.ceramic-6.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_17\",\"ipfsRpcAddr\":\"http://ceramic-7-0.ceramic-7.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-7-0.ceramic-7.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_18\",\"ipfsRpcAddr\":\"http://ceramic-8-0.ceramic-8.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-8-0.ceramic-8.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_19\",\"ipfsRpcAddr\":\"http://ceramic-9-0.ceramic-9.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-9-0.ceramic-9.keramik-test.svc.cluster.local:7007\",\"p2pAddrs\":[]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs-0.cas-ipfs.keramik-test.svc.cluster.local:5101\",\"p2pAddrs\":[]}}]" + "peers.json": "[{\"ceramic\":{\"peerId\":\"peer_id_0\",\"ipfsRpcAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_1\",\"ipfsRpcAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_2\",\"ipfsRpcAddr\":\"http://ceramic-0-2.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-2.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-2.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_3\",\"ipfsRpcAddr\":\"http://ceramic-0-3.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-3.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-3.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_4\",\"ipfsRpcAddr\":\"http://ceramic-0-4.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-4.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-4.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_5\",\"ipfsRpcAddr\":\"http://ceramic-0-5.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-5.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-5.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_6\",\"ipfsRpcAddr\":\"http://ceramic-0-6.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-6.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-6.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_7\",\"ipfsRpcAddr\":\"http://ceramic-0-7.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-7.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-7.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_8\",\"ipfsRpcAddr\":\"http://ceramic-0-8.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-8.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-8.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_9\",\"ipfsRpcAddr\":\"http://ceramic-0-9.ceramic-0.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-0-9.ceramic-0.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-0-9.ceramic-0.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_10\",\"ipfsRpcAddr\":\"http://ceramic-1-0.ceramic-1.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-1-0.ceramic-1.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-1-0.ceramic-1.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_11\",\"ipfsRpcAddr\":\"http://ceramic-1-1.ceramic-1.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-1-1.ceramic-1.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-1-1.ceramic-1.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_12\",\"ipfsRpcAddr\":\"http://ceramic-2-0.ceramic-2.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-2-0.ceramic-2.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-2-0.ceramic-2.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_13\",\"ipfsRpcAddr\":\"http://ceramic-3-0.ceramic-3.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-3-0.ceramic-3.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-3-0.ceramic-3.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_14\",\"ipfsRpcAddr\":\"http://ceramic-4-0.ceramic-4.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-4-0.ceramic-4.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-4-0.ceramic-4.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_15\",\"ipfsRpcAddr\":\"http://ceramic-5-0.ceramic-5.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-5-0.ceramic-5.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-5-0.ceramic-5.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_16\",\"ipfsRpcAddr\":\"http://ceramic-6-0.ceramic-6.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-6-0.ceramic-6.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-6-0.ceramic-6.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_17\",\"ipfsRpcAddr\":\"http://ceramic-7-0.ceramic-7.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-7-0.ceramic-7.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-7-0.ceramic-7.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_18\",\"ipfsRpcAddr\":\"http://ceramic-8-0.ceramic-8.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-8-0.ceramic-8.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-8-0.ceramic-8.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ceramic\":{\"peerId\":\"peer_id_19\",\"ipfsRpcAddr\":\"http://ceramic-9-0.ceramic-9.keramik-test.svc.cluster.local:5101\",\"ceramicAddr\":\"http://ceramic-9-0.ceramic-9.keramik-test.svc.cluster.local:7007\",\"flightAddr\":\"http://ceramic-9-0.ceramic-9.keramik-test.svc.cluster.local:5102\",\"p2pAddrs\":[]}},{\"ipfs\":{\"peerId\":\"cas_peer_id\",\"ipfsRpcAddr\":\"http://cas-ipfs-0.cas-ipfs.keramik-test.svc.cluster.local:5101\",\"p2pAddrs\":[]}}]" }, "kind": "ConfigMap", "metadata": { diff --git a/operator/src/network/testdata/ceramics_weighted_status b/operator/src/network/testdata/ceramics_weighted_status index de30b02f..e69ad5c3 100644 --- a/operator/src/network/testdata/ceramics_weighted_status +++ b/operator/src/network/testdata/ceramics_weighted_status @@ -13,6 +13,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-0-0.ceramic-0.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_0" @@ -21,6 +22,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-0-1.ceramic-0.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_1" @@ -29,6 +31,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-0-2.ceramic-0.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-0-2.ceramic-0.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-0-2.ceramic-0.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_2" @@ -37,6 +40,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-0-3.ceramic-0.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-0-3.ceramic-0.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-0-3.ceramic-0.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_3" @@ -45,6 +49,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-0-4.ceramic-0.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-0-4.ceramic-0.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-0-4.ceramic-0.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_4" @@ -53,6 +58,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-0-5.ceramic-0.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-0-5.ceramic-0.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-0-5.ceramic-0.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_5" @@ -61,6 +67,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-0-6.ceramic-0.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-0-6.ceramic-0.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-0-6.ceramic-0.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_6" @@ -69,6 +76,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-0-7.ceramic-0.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-0-7.ceramic-0.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-0-7.ceramic-0.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_7" @@ -77,6 +85,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-0-8.ceramic-0.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-0-8.ceramic-0.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-0-8.ceramic-0.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_8" @@ -85,6 +94,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-0-9.ceramic-0.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-0-9.ceramic-0.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-0-9.ceramic-0.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_9" @@ -93,6 +103,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-1-0.ceramic-1.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-1-0.ceramic-1.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-1-0.ceramic-1.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_10" @@ -101,6 +112,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-1-1.ceramic-1.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-1-1.ceramic-1.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-1-1.ceramic-1.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_11" @@ -109,6 +121,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-2-0.ceramic-2.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-2-0.ceramic-2.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-2-0.ceramic-2.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_12" @@ -117,6 +130,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-3-0.ceramic-3.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-3-0.ceramic-3.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-3-0.ceramic-3.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_13" @@ -125,6 +139,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-4-0.ceramic-4.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-4-0.ceramic-4.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-4-0.ceramic-4.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_14" @@ -133,6 +148,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-5-0.ceramic-5.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-5-0.ceramic-5.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-5-0.ceramic-5.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_15" @@ -141,6 +157,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-6-0.ceramic-6.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-6-0.ceramic-6.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-6-0.ceramic-6.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_16" @@ -149,6 +166,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-7-0.ceramic-7.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-7-0.ceramic-7.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-7-0.ceramic-7.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_17" @@ -157,6 +175,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-8-0.ceramic-8.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-8-0.ceramic-8.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-8-0.ceramic-8.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_18" @@ -165,6 +184,7 @@ Request { { "ceramic": { "ceramicAddr": "http://ceramic-9-0.ceramic-9.keramik-test.svc.cluster.local:7007", + "flightAddr": "http://ceramic-9-0.ceramic-9.keramik-test.svc.cluster.local:5102", "ipfsRpcAddr": "http://ceramic-9-0.ceramic-9.keramik-test.svc.cluster.local:5101", "p2pAddrs": [], "peerId": "peer_id_19" diff --git a/operator/src/network/testdata/default_stubs/cas_ipfs_stateful_set b/operator/src/network/testdata/default_stubs/cas_ipfs_stateful_set index 349aaeb8..29f993b4 100644 --- a/operator/src/network/testdata/default_stubs/cas_ipfs_stateful_set +++ b/operator/src/network/testdata/default_stubs/cas_ipfs_stateful_set @@ -91,6 +91,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/network/testdata/default_stubs/ceramic_service b/operator/src/network/testdata/default_stubs/ceramic_service index 93a5168a..eecc0af1 100644 --- a/operator/src/network/testdata/default_stubs/ceramic_service +++ b/operator/src/network/testdata/default_stubs/ceramic_service @@ -29,6 +29,11 @@ Request { "port": 5101, "protocol": "TCP" }, + { + "name": "flight", + "port": 5102, + "protocol": "TCP" + }, { "name": "swarm-tcp", "port": 4101, diff --git a/operator/src/network/testdata/default_stubs/ceramic_stateful_set b/operator/src/network/testdata/default_stubs/ceramic_stateful_set index 3f6e066d..19edf17e 100644 --- a/operator/src/network/testdata/default_stubs/ceramic_stateful_set +++ b/operator/src/network/testdata/default_stubs/ceramic_stateful_set @@ -274,6 +274,11 @@ Request { "name": "rpc", "protocol": "TCP" }, + { + "containerPort": 5102, + "name": "flight", + "protocol": "TCP" + }, { "containerPort": 9465, "name": "metrics", diff --git a/operator/src/simulation/controller.rs b/operator/src/simulation/controller.rs index a402153e..37b31efb 100644 --- a/operator/src/simulation/controller.rs +++ b/operator/src/simulation/controller.rs @@ -551,18 +551,21 @@ mod tests { ipfs_rpc_addr: "ipfs_rpc_addr_0".to_owned(), ceramic_addr: "ceramic_addr_0".to_owned(), p2p_addrs: vec!["p2p_addr_0".to_owned(), "p2p_addr_1".to_owned()], + flight_addr: "flight_addr_0".to_owned(), }), Peer::Ceramic(CeramicPeerInfo { peer_id: "1".to_owned(), ipfs_rpc_addr: "ipfs_rpc_addr_1".to_owned(), ceramic_addr: "ceramic_addr_1".to_owned(), p2p_addrs: vec!["p2p_addr_0".to_owned(), "p2p_addr_1".to_owned()], + flight_addr: "flight_addr_1".to_owned(), }), Peer::Ceramic(CeramicPeerInfo { peer_id: "2".to_owned(), ipfs_rpc_addr: "ipfs_rpc_addr_2".to_owned(), ceramic_addr: "ceramic_addr_2".to_owned(), p2p_addrs: vec!["p2p_addr_0".to_owned(), "p2p_addr_1".to_owned()], + flight_addr: "flight_addr_2".to_owned(), }), ]; diff --git a/operator/src/simulation/stub.rs b/operator/src/simulation/stub.rs index 907f16ea..6de2d5fb 100644 --- a/operator/src/simulation/stub.rs +++ b/operator/src/simulation/stub.rs @@ -106,12 +106,14 @@ impl Default for Stub { ipfs_rpc_addr: "ipfs_rpc_addr_0".to_owned(), ceramic_addr: "ceramic_addr_0".to_owned(), p2p_addrs: vec!["p2p_addr_0".to_owned(), "p2p_addr_1".to_owned()], + flight_addr: "flight_addr_0".to_owned(), }), Peer::Ceramic(CeramicPeerInfo { peer_id: "1".to_owned(), ipfs_rpc_addr: "ipfs_rpc_addr_1".to_owned(), ceramic_addr: "ceramic_addr_1".to_owned(), p2p_addrs: vec!["p2p_addr_0".to_owned(), "p2p_addr_1".to_owned()], + flight_addr: "flight_addr_1".to_owned(), }), ]; diff --git a/runner/src/simulate.rs b/runner/src/simulate.rs index 1b6aebf2..995d4d4c 100644 --- a/runner/src/simulate.rs +++ b/runner/src/simulate.rs @@ -1440,12 +1440,14 @@ mod test { ceramic_addr: "http://ceramic-0:7007".into(), ipfs_rpc_addr: "http://ipfs-0:5001".into(), p2p_addrs: vec!["p2p/p2p-circuit-0/ipfs".into()], + flight_addr: "flight_addr_0".to_owned(), }), Peer::Ceramic(CeramicPeerInfo { peer_id: "1".into(), ceramic_addr: "http://ceramic-1:7007".into(), ipfs_rpc_addr: "http://ipfs-1:5001".into(), p2p_addrs: vec!["p2p/p2p-circuit-1/ipfs".into()], + flight_addr: "flight_addr_1".to_owned(), }), ] }