Skip to content

chore: remove unused port configs in favor of custom serve & move api-peer from 6422->6421 #2953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 09-19-chore_pegboard_migrate_pegboard-ws_to_custom_serve
Choose a base branch
from
+78 −209
Open

chore: remove unused port configs in favor of custom serve & move api-peer from 6422->6421 #2953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

[workspace]
resolver = "2"
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"]
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"]

[workspace.package]
version = "25.7.1"
Expand Down Expand Up @@ -359,8 +359,8 @@ path = "packages/core/guard/server"
[workspace.dependencies.pegboard-gateway]
path = "packages/core/pegboard-gateway"

[workspace.dependencies.pegboard-runner-ws]
path = "packages/core/pegboard-runner-ws"
[workspace.dependencies.pegboard-runner]
path = "packages/core/pegboard-runner"

[workspace.dependencies.pegboard-serverless]
path = "packages/core/pegboard-serverless"
Expand Down
2 changes: 1 addition & 1 deletion dev-docs/GUARD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ When the `x-rivet-target` header is present, routes to specific service types:
- `x-rivet-addr: <address>` - Direct address override for actor location
- **Behavior**: Routes to the specific actor instance, with cross-datacenter routing if the actor resides in a different DC

**Runner WebSocket** (`x-rivet-target: runner-ws`):
**Runner** (`x-rivet-target: runner`):
- **Purpose**: Routes WebSocket connections to the Pegboard runner service
- **Target**: Routes to the configured Pegboard service (`pegboard.lan_host:pegboard.port`)
- **Use case**: WebSocket connections between runners and the orchestration system
Expand Down
4 changes: 2 additions & 2 deletions docker/dev-host/rivet-engine/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"api_peer": {
"host": "0.0.0.0",
"port": 6422
"port": 6421
},
"pegboard": {
"lan_host": "127.0.0.1",
Expand All @@ -19,7 +19,7 @@
"name": "local",
"datacenter_label": 1,
"is_leader": true,
"api_peer_url": "http://127.0.0.1:6422",
"api_peer_url": "http://127.0.0.1:6421",
"guard_url": "http://127.0.0.1:6420"
}
]
Expand Down
8 changes: 4 additions & 4 deletions docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/0/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"api_peer": {
"host": "0.0.0.0",
"port": 6422
"port": 6421
},
"pegboard": {
"lan_host": "rivet-engine-dc-a-0",
Expand All @@ -19,21 +19,21 @@
"name": "dc-a",
"datacenter_label": 1,
"is_leader": true,
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
"guard_url": "http://rivet-engine-dc-a-0:6420"
},
{
"name": "dc-b",
"datacenter_label": 2,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
"guard_url": "http://rivet-engine-dc-b-0:6420"
},
{
"name": "dc-c",
"datacenter_label": 3,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
"guard_url": "http://rivet-engine-dc-c-0:6420"
}
]
Expand Down
8 changes: 4 additions & 4 deletions docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/1/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"api_peer": {
"host": "0.0.0.0",
"port": 6422
"port": 6421
},
"pegboard": {
"lan_host": "rivet-engine-dc-a-0",
Expand All @@ -19,21 +19,21 @@
"name": "dc-a",
"datacenter_label": 1,
"is_leader": true,
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
"guard_url": "http://rivet-engine-dc-a-0:6420"
},
{
"name": "dc-b",
"datacenter_label": 2,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
"guard_url": "http://rivet-engine-dc-b-0:6420"
},
{
"name": "dc-c",
"datacenter_label": 3,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
"guard_url": "http://rivet-engine-dc-c-0:6420"
}
]
Expand Down
8 changes: 4 additions & 4 deletions docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/2/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"api_peer": {
"host": "0.0.0.0",
"port": 6422
"port": 6421
},
"pegboard": {
"lan_host": "rivet-engine-dc-a-0",
Expand All @@ -19,21 +19,21 @@
"name": "dc-a",
"datacenter_label": 1,
"is_leader": true,
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
"guard_url": "http://rivet-engine-dc-a-0:6420"
},
{
"name": "dc-b",
"datacenter_label": 2,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
"guard_url": "http://rivet-engine-dc-b-0:6420"
},
{
"name": "dc-c",
"datacenter_label": 3,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
"guard_url": "http://rivet-engine-dc-c-0:6420"
}
]
Expand Down
8 changes: 4 additions & 4 deletions docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/0/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"api_peer": {
"host": "0.0.0.0",
"port": 6422
"port": 6421
},
"pegboard": {
"lan_host": "rivet-engine-dc-b-0",
Expand All @@ -19,21 +19,21 @@
"name": "dc-a",
"datacenter_label": 1,
"is_leader": true,
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
"guard_url": "http://rivet-engine-dc-a-0:6420"
},
{
"name": "dc-b",
"datacenter_label": 2,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
"guard_url": "http://rivet-engine-dc-b-0:6420"
},
{
"name": "dc-c",
"datacenter_label": 3,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
"guard_url": "http://rivet-engine-dc-c-0:6420"
}
]
Expand Down
8 changes: 4 additions & 4 deletions docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/1/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"api_peer": {
"host": "0.0.0.0",
"port": 6422
"port": 6421
},
"pegboard": {
"lan_host": "rivet-engine-dc-b-0",
Expand All @@ -19,21 +19,21 @@
"name": "dc-a",
"datacenter_label": 1,
"is_leader": true,
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
"guard_url": "http://rivet-engine-dc-a-0:6420"
},
{
"name": "dc-b",
"datacenter_label": 2,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
"guard_url": "http://rivet-engine-dc-b-0:6420"
},
{
"name": "dc-c",
"datacenter_label": 3,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
"guard_url": "http://rivet-engine-dc-c-0:6420"
}
]
Expand Down
8 changes: 4 additions & 4 deletions docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/2/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"api_peer": {
"host": "0.0.0.0",
"port": 6422
"port": 6421
},
"pegboard": {
"lan_host": "rivet-engine-dc-b-0",
Expand All @@ -19,21 +19,21 @@
"name": "dc-a",
"datacenter_label": 1,
"is_leader": true,
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
"guard_url": "http://rivet-engine-dc-a-0:6420"
},
{
"name": "dc-b",
"datacenter_label": 2,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
"guard_url": "http://rivet-engine-dc-b-0:6420"
},
{
"name": "dc-c",
"datacenter_label": 3,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
"guard_url": "http://rivet-engine-dc-c-0:6420"
}
]
Expand Down
8 changes: 4 additions & 4 deletions docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/0/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"api_peer": {
"host": "0.0.0.0",
"port": 6422
"port": 6421
},
"pegboard": {
"lan_host": "rivet-engine-dc-c-0",
Expand All @@ -19,21 +19,21 @@
"name": "dc-a",
"datacenter_label": 1,
"is_leader": true,
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
"guard_url": "http://rivet-engine-dc-a-0:6420"
},
{
"name": "dc-b",
"datacenter_label": 2,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
"guard_url": "http://rivet-engine-dc-b-0:6420"
},
{
"name": "dc-c",
"datacenter_label": 3,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
"guard_url": "http://rivet-engine-dc-c-0:6420"
}
]
Expand Down
8 changes: 4 additions & 4 deletions docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/1/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"api_peer": {
"host": "0.0.0.0",
"port": 6422
"port": 6421
},
"pegboard": {
"lan_host": "rivet-engine-dc-c-0",
Expand All @@ -19,21 +19,21 @@
"name": "dc-a",
"datacenter_label": 1,
"is_leader": true,
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
"guard_url": "http://rivet-engine-dc-a-0:6420"
},
{
"name": "dc-b",
"datacenter_label": 2,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
"guard_url": "http://rivet-engine-dc-b-0:6420"
},
{
"name": "dc-c",
"datacenter_label": 3,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
"guard_url": "http://rivet-engine-dc-c-0:6420"
}
]
Expand Down
8 changes: 4 additions & 4 deletions docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/2/config.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
},
"api_peer": {
"host": "0.0.0.0",
"port": 6422
"port": 6421
},
"pegboard": {
"lan_host": "rivet-engine-dc-c-0",
Expand All @@ -19,21 +19,21 @@
"name": "dc-a",
"datacenter_label": 1,
"is_leader": true,
"api_peer_url": "http://rivet-engine-dc-a-0:6422",
"api_peer_url": "http://rivet-engine-dc-a-0:6421",
"guard_url": "http://rivet-engine-dc-a-0:6420"
},
{
"name": "dc-b",
"datacenter_label": 2,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-b-0:6422",
"api_peer_url": "http://rivet-engine-dc-b-0:6421",
"guard_url": "http://rivet-engine-dc-b-0:6420"
},
{
"name": "dc-c",
"datacenter_label": 3,
"is_leader": false,
"api_peer_url": "http://rivet-engine-dc-c-0:6422",
"api_peer_url": "http://rivet-engine-dc-c-0:6421",
"guard_url": "http://rivet-engine-dc-c-0:6420"
}
]
Expand Down
Loading
Loading