From c7a4604568a39fedb144bd1db67d56b00a447038 Mon Sep 17 00:00:00 2001 From: Nathaniel Cook Date: Tue, 17 Dec 2024 12:30:50 -0700 Subject: [PATCH] fix: expose flight sql addr in peers.json --- common/src/peer_info.rs | 2 + operator/src/network/ceramic.rs | 7 ++++ operator/src/network/controller.rs | 38 +++++++++++++------ .../network/testdata/ceramic_weighted_peers | 2 +- .../network/testdata/ceramics_weighted_status | 20 ++++++++++ operator/src/simulation/controller.rs | 3 ++ operator/src/simulation/stub.rs | 2 + runner/src/simulate.rs | 2 + 8 files changed, 63 insertions(+), 13 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 d22e37f9..87c28ff7 100644 --- a/operator/src/network/ceramic.rs +++ b/operator/src/network/ceramic.rs @@ -258,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 36b0599e..7896ca4c 100644 --- a/operator/src/network/controller.rs +++ b/operator/src/network/controller.rs @@ -869,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) => { @@ -882,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, })); } } @@ -1324,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": { @@ -1332,7 +1334,7 @@ mod tests { stub.status.patch(expect![[r#" --- original +++ modified - @@ -8,10 +8,40 @@ + @@ -8,10 +8,42 @@ body: { "status": { "expirationTime": null, @@ -1345,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" @@ -1355,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" @@ -1561,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": { @@ -1569,7 +1573,7 @@ mod tests { stub.status.patch(expect![[r#" --- original +++ modified - @@ -8,10 +8,40 @@ + @@ -8,10 +8,42 @@ body: { "status": { "expirationTime": null, @@ -1582,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" @@ -1592,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" @@ -1710,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": { @@ -1718,7 +1724,7 @@ mod tests { stub.status.patch(expect![[r#" --- original +++ modified - @@ -8,10 +8,40 @@ + @@ -8,10 +8,42 @@ body: { "status": { "expirationTime": null, @@ -1731,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" @@ -1741,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" @@ -1843,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": { @@ -1851,7 +1859,7 @@ mod tests { stub.status.patch(expect![[r#" --- original +++ modified - @@ -8,10 +8,40 @@ + @@ -8,10 +8,42 @@ body: { "status": { "expirationTime": null, @@ -1864,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" @@ -1874,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" @@ -1980,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": { @@ -1988,7 +1998,7 @@ mod tests { stub.status.patch(expect![[r#" --- original +++ modified - @@ -8,10 +8,40 @@ + @@ -8,10 +8,42 @@ body: { "status": { "expirationTime": null, @@ -2001,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" @@ -2011,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" @@ -2110,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": { @@ -2118,7 +2130,7 @@ mod tests { stub.status.patch(expect![[r#" --- original +++ modified - @@ -8,10 +8,40 @@ + @@ -8,10 +8,42 @@ body: { "status": { "expirationTime": null, @@ -2131,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" @@ -2141,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" 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/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 67e53ec4..b921a80f 100644 --- a/operator/src/simulation/stub.rs +++ b/operator/src/simulation/stub.rs @@ -94,12 +94,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(), }), ] }