Skip to content

Commit 3882bab

Browse files
NathanFlurryNathanFlurry
committed
chore: remove unused port configs in favor of custom serve & move api-peer from 6422->6421
1 parent 0652584 commit 3882bab

File tree

33 files changed

+78
-209
lines changed

33 files changed

+78
-209
lines changed

‎Cargo.lock‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
[workspace]
33
resolver = "2"
4-
members = ["packages/common/api-builder","packages/common/api-types","packages/common/api-util","packages/common/cache/build","packages/common/cache/result","packages/common/clickhouse-inserter","packages/common/clickhouse-user-query","packages/common/config","packages/common/env","packages/common/error/core","packages/common/error/macros","packages/common/gasoline/core","packages/common/gasoline/macros","packages/common/logs","packages/common/metrics","packages/common/pools","packages/common/runtime","packages/common/service-manager","packages/common/telemetry","packages/common/test-deps","packages/common/test-deps-docker","packages/common/types","packages/common/universaldb","packages/common/universalpubsub","packages/common/util/core","packages/common/util/id","packages/common/versioned-data-util","packages/core/actor-kv","packages/core/api-peer","packages/core/api-public","packages/core/bootstrap","packages/core/dump-openapi","packages/core/guard/core","packages/core/guard/server","packages/core/pegboard-gateway","packages/core/pegboard-runner-ws","packages/core/pegboard-serverless","packages/core/pegboard-tunnel","packages/core/workflow-worker","packages/infra/engine","packages/services/epoxy","packages/services/internal","packages/services/namespace","packages/services/pegboard","sdks/rust/api-full","sdks/rust/bare_gen","sdks/rust/data","sdks/rust/epoxy-protocol","sdks/rust/runner-protocol","sdks/rust/tunnel-protocol","sdks/rust/ups-protocol"]
4+
members = ["packages/common/api-builder","packages/common/api-types","packages/common/api-util","packages/common/cache/build","packages/common/cache/result","packages/common/clickhouse-inserter","packages/common/clickhouse-user-query","packages/common/config","packages/common/env","packages/common/error/core","packages/common/error/macros","packages/common/gasoline/core","packages/common/gasoline/macros","packages/common/logs","packages/common/metrics","packages/common/pools","packages/common/runtime","packages/common/service-manager","packages/common/telemetry","packages/common/test-deps","packages/common/test-deps-docker","packages/common/types","packages/common/universaldb","packages/common/universalpubsub","packages/common/util/core","packages/common/util/id","packages/common/versioned-data-util","packages/core/actor-kv","packages/core/api-peer","packages/core/api-public","packages/core/bootstrap","packages/core/dump-openapi","packages/core/guard/core","packages/core/guard/server","packages/core/pegboard-gateway","packages/core/pegboard-runner","packages/core/pegboard-serverless","packages/core/pegboard-tunnel","packages/core/workflow-worker","packages/infra/engine","packages/services/epoxy","packages/services/internal","packages/services/namespace","packages/services/pegboard","sdks/rust/api-full","sdks/rust/bare_gen","sdks/rust/data","sdks/rust/epoxy-protocol","sdks/rust/runner-protocol","sdks/rust/tunnel-protocol","sdks/rust/ups-protocol"]
55

66
[workspace.package]
77
version = "25.7.1"
@@ -359,8 +359,8 @@ path = "packages/core/guard/server"
359359
[workspace.dependencies.pegboard-gateway]
360360
path = "packages/core/pegboard-gateway"
361361

362-
[workspace.dependencies.pegboard-runner-ws]
363-
path = "packages/core/pegboard-runner-ws"
362+
[workspace.dependencies.pegboard-runner]
363+
path = "packages/core/pegboard-runner"
364364

365365
[workspace.dependencies.pegboard-serverless]
366366
path = "packages/core/pegboard-serverless"

‎dev-docs/GUARD.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ When the `x-rivet-target` header is present, routes to specific service types:
5858
- `x-rivet-addr: <address>` - Direct address override for actor location
5959
- **Behavior**: Routes to the specific actor instance, with cross-datacenter routing if the actor resides in a different DC
6060

61-
**Runner WebSocket** (`x-rivet-target: runner-ws`):
61+
**Runner** (`x-rivet-target: runner`):
6262
- **Purpose**: Routes WebSocket connections to the Pegboard runner service
6363
- **Target**: Routes to the configured Pegboard service (`pegboard.lan_host:pegboard.port`)
6464
- **Use case**: WebSocket connections between runners and the orchestration system

‎docker/dev-host/rivet-engine/config.jsonc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"api_peer": {
66
"host": "0.0.0.0",
7-
"port": 6422
7+
"port": 6421
88
},
99
"pegboard": {
1010
"lan_host": "127.0.0.1",
@@ -19,7 +19,7 @@
1919
"name": "local",
2020
"datacenter_label": 1,
2121
"is_leader": true,
22-
"api_peer_url": "http://127.0.0.1:6422",
22+
"api_peer_url": "http://127.0.0.1:6421",
2323
"guard_url": "http://127.0.0.1:6420"
2424
}
2525
]

‎docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/0/config.jsonc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"api_peer": {
66
"host": "0.0.0.0",
7-
"port": 6422
7+
"port": 6421
88
},
99
"pegboard": {
1010
"lan_host": "rivet-engine-dc-a-0",
@@ -19,21 +19,21 @@
1919
"name": "dc-a",
2020
"datacenter_label": 1,
2121
"is_leader": true,
22-
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
22+
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
2323
"guard_url": "http://rivet-engine-dc-a-0:6420"
2424
},
2525
{
2626
"name": "dc-b",
2727
"datacenter_label": 2,
2828
"is_leader": false,
29-
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
29+
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
3030
"guard_url": "http://rivet-engine-dc-b-0:6420"
3131
},
3232
{
3333
"name": "dc-c",
3434
"datacenter_label": 3,
3535
"is_leader": false,
36-
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
36+
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
3737
"guard_url": "http://rivet-engine-dc-c-0:6420"
3838
}
3939
]

‎docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/1/config.jsonc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"api_peer": {
66
"host": "0.0.0.0",
7-
"port": 6422
7+
"port": 6421
88
},
99
"pegboard": {
1010
"lan_host": "rivet-engine-dc-a-0",
@@ -19,21 +19,21 @@
1919
"name": "dc-a",
2020
"datacenter_label": 1,
2121
"is_leader": true,
22-
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
22+
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
2323
"guard_url": "http://rivet-engine-dc-a-0:6420"
2424
},
2525
{
2626
"name": "dc-b",
2727
"datacenter_label": 2,
2828
"is_leader": false,
29-
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
29+
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
3030
"guard_url": "http://rivet-engine-dc-b-0:6420"
3131
},
3232
{
3333
"name": "dc-c",
3434
"datacenter_label": 3,
3535
"is_leader": false,
36-
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
36+
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
3737
"guard_url": "http://rivet-engine-dc-c-0:6420"
3838
}
3939
]

‎docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/2/config.jsonc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"api_peer": {
66
"host": "0.0.0.0",
7-
"port": 6422
7+
"port": 6421
88
},
99
"pegboard": {
1010
"lan_host": "rivet-engine-dc-a-0",
@@ -19,21 +19,21 @@
1919
"name": "dc-a",
2020
"datacenter_label": 1,
2121
"is_leader": true,
22-
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
22+
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
2323
"guard_url": "http://rivet-engine-dc-a-0:6420"
2424
},
2525
{
2626
"name": "dc-b",
2727
"datacenter_label": 2,
2828
"is_leader": false,
29-
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
29+
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
3030
"guard_url": "http://rivet-engine-dc-b-0:6420"
3131
},
3232
{
3333
"name": "dc-c",
3434
"datacenter_label": 3,
3535
"is_leader": false,
36-
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
36+
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
3737
"guard_url": "http://rivet-engine-dc-c-0:6420"
3838
}
3939
]

‎docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/0/config.jsonc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"api_peer": {
66
"host": "0.0.0.0",
7-
"port": 6422
7+
"port": 6421
88
},
99
"pegboard": {
1010
"lan_host": "rivet-engine-dc-b-0",
@@ -19,21 +19,21 @@
1919
"name": "dc-a",
2020
"datacenter_label": 1,
2121
"is_leader": true,
22-
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
22+
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
2323
"guard_url": "http://rivet-engine-dc-a-0:6420"
2424
},
2525
{
2626
"name": "dc-b",
2727
"datacenter_label": 2,
2828
"is_leader": false,
29-
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
29+
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
3030
"guard_url": "http://rivet-engine-dc-b-0:6420"
3131
},
3232
{
3333
"name": "dc-c",
3434
"datacenter_label": 3,
3535
"is_leader": false,
36-
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
36+
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
3737
"guard_url": "http://rivet-engine-dc-c-0:6420"
3838
}
3939
]

‎docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/1/config.jsonc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"api_peer": {
66
"host": "0.0.0.0",
7-
"port": 6422
7+
"port": 6421
88
},
99
"pegboard": {
1010
"lan_host": "rivet-engine-dc-b-0",
@@ -19,21 +19,21 @@
1919
"name": "dc-a",
2020
"datacenter_label": 1,
2121
"is_leader": true,
22-
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
22+
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
2323
"guard_url": "http://rivet-engine-dc-a-0:6420"
2424
},
2525
{
2626
"name": "dc-b",
2727
"datacenter_label": 2,
2828
"is_leader": false,
29-
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
29+
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
3030
"guard_url": "http://rivet-engine-dc-b-0:6420"
3131
},
3232
{
3333
"name": "dc-c",
3434
"datacenter_label": 3,
3535
"is_leader": false,
36-
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
36+
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
3737
"guard_url": "http://rivet-engine-dc-c-0:6420"
3838
}
3939
]

‎docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/2/config.jsonc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"api_peer": {
66
"host": "0.0.0.0",
7-
"port": 6422
7+
"port": 6421
88
},
99
"pegboard": {
1010
"lan_host": "rivet-engine-dc-b-0",
@@ -19,21 +19,21 @@
1919
"name": "dc-a",
2020
"datacenter_label": 1,
2121
"is_leader": true,
22-
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
22+
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
2323
"guard_url": "http://rivet-engine-dc-a-0:6420"
2424
},
2525
{
2626
"name": "dc-b",
2727
"datacenter_label": 2,
2828
"is_leader": false,
29-
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
29+
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
3030
"guard_url": "http://rivet-engine-dc-b-0:6420"
3131
},
3232
{
3333
"name": "dc-c",
3434
"datacenter_label": 3,
3535
"is_leader": false,
36-
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
36+
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
3737
"guard_url": "http://rivet-engine-dc-c-0:6420"
3838
}
3939
]

0 commit comments

Comments
 (0)