Skip to content

Commit

Permalink
fix: use same c1 p2p key dir as store dir (#201)
Browse files Browse the repository at this point in the history
  • Loading branch information
@smrz2001
smrz2001 authored Jul 11, 2024
1 parent 7c033b1 commit b2429b3
Show file tree
Hide file tree
Showing 15 changed files with 117 additions and 40 deletions.
100 changes: 60 additions & 40 deletions operator/src/network/controller.rs
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions operator/src/network/ipfs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,11 @@ impl RustIpfsConfig {
value: Some(IPFS_STORE_DIR.to_owned()),
..Default::default()
},
EnvVar {
name: "CERAMIC_ONE_P2P_KEY_DIR".to_owned(),
value: Some(IPFS_STORE_DIR.to_owned()),
..Default::default()
},
EnvVar {
name: "CERAMIC_ONE_NETWORK".to_owned(),
value: Some(net_config.network_type.name().to_owned()),
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/ceramic_ss_1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/ceramic_ss_weighted_0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/ceramic_ss_weighted_1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/ceramic_ss_weighted_2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/ceramic_ss_weighted_3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/ceramic_ss_weighted_4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/ceramic_ss_weighted_5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/ceramic_ss_weighted_6
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/ceramic_ss_weighted_7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/ceramic_ss_weighted_8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/ceramic_ss_weighted_9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/default_stubs/cas_ipfs_stateful_set
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down
4 changes: 4 additions & 0 deletions operator/src/network/testdata/default_stubs/ceramic_stateful_set
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ Request {
"name": "CERAMIC_ONE_NETWORK",
"value": "local"
},
{
"name": "CERAMIC_ONE_P2P_KEY_DIR",
"value": "/data/ipfs"
},
{
"name": "CERAMIC_ONE_STORE_DIR",
"value": "/data/ipfs"
Expand Down

0 comments on commit b2429b3

Please sign in to comment.