Skip to content

fix: update how port-forwarding is done #665

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

Merged
Anmol1696 merged 2 commits into from
Apr 9, 2025
Merged

fix: update how port-forwarding is done #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3b99ac
update how port-forwarding is done
Anmol1696 Apr 9, 2025
0770168
update tests, run linter
Anmol1696 Apr 9, 2025
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
1 change: 1 addition & 0 deletions clients/js/__output__/custom-pod-ports.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ chains:
ethereum:
rpc: 8551
rest: 8545
ws: 8546
defaultPorts:
rpc: 26657
grpc: 9090
Expand Down
12 changes: 6 additions & 6 deletions clients/js/packages/client/__tests__/__snapshots__/client.config.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ Log: Trying to stop all port-forward, if any....
ps -ef | grep -i 'kubectl port-forward' | grep -v 'grep' | awk '{print $2}'
sleep 2
Log: Starting new port forwarding...
kubectl port-forward pods/osmosis-1-genesis-0 26657:26657 > /dev/null 2>&1 &
Log: Forwarded osmosis-1-genesis-0: local 26657 -> target (host) 26657
kubectl port-forward pods/osmosis-1-genesis-0 1317:1317 > /dev/null 2>&1 &
Log: Forwarded osmosis-1-genesis-0: local 1317 -> target (host) 1317
kubectl port-forward pods/osmosis-1-genesis-0 26657:26657 > /dev/null 2>&1 &
Log: Forwarded osmosis-1-genesis-0: local 26657 -> target (host) 26657
kubectl port-forward pods/osmosis-1-genesis-0 8007:8000 > /dev/null 2>&1 &
Log: Forwarded osmosis-1-genesis-0: local 8007 -> target (host) 8000
kubectl port-forward pods/cosmos-2-genesis-0 26653:26657 > /dev/null 2>&1 &
Log: Forwarded cosmos-2-genesis-0: local 26653 -> target (host) 26657
kubectl port-forward pods/cosmos-2-genesis-0 1313:1317 > /dev/null 2>&1 &
Log: Forwarded cosmos-2-genesis-0: local 1313 -> target (host) 1317
kubectl port-forward pods/cosmos-2-genesis-0 26653:26657 > /dev/null 2>&1 &
Log: Forwarded cosmos-2-genesis-0: local 26653 -> target (host) 26657
kubectl port-forward pods/cosmos-2-genesis-0 8003:8000 > /dev/null 2>&1 &
Log: Forwarded cosmos-2-genesis-0: local 8003 -> target (host) 8000
kubectl port-forward service/registry 8081:8080 > /dev/null 2>&1 &
Expand All @@ -52,11 +52,11 @@ helm search repo starship/devnet --version v0.2.3
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
ps -ef | grep -i 'kubectl port-forward' | grep -v 'grep' | awk '{print $2}'
sleep 2
kubectl port-forward pods/osmosis-1-genesis-0 26657:26657 > /dev/null 2>&1 &
kubectl port-forward pods/osmosis-1-genesis-0 1317:1317 > /dev/null 2>&1 &
kubectl port-forward pods/osmosis-1-genesis-0 26657:26657 > /dev/null 2>&1 &
kubectl port-forward pods/osmosis-1-genesis-0 8007:8000 > /dev/null 2>&1 &
kubectl port-forward pods/cosmos-2-genesis-0 26653:26657 > /dev/null 2>&1 &
kubectl port-forward pods/cosmos-2-genesis-0 1313:1317 > /dev/null 2>&1 &
kubectl port-forward pods/cosmos-2-genesis-0 26653:26657 > /dev/null 2>&1 &
kubectl port-forward pods/cosmos-2-genesis-0 8003:8000 > /dev/null 2>&1 &
kubectl port-forward service/registry 8081:8080 > /dev/null 2>&1 &
kubectl port-forward service/registry 9091:9090 > /dev/null 2>&1 &
Expand Down
6 changes: 3 additions & 3 deletions clients/js/packages/client/__tests__/__snapshots__/client.ports.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ kubectl port-forward pods/osmosis-1-genesis-0 1317:6767676 > /dev/null 2>&1 &
Log: Forwarded osmosis-1-genesis-0: local 1317 -> target (host) 6767676
kubectl port-forward pods/osmosis-1-genesis-0 8007:1000000 > /dev/null 2>&1 &
Log: Forwarded osmosis-1-genesis-0: local 8007 -> target (host) 1000000
kubectl port-forward pods/cosmos-2-genesis-0 26653:26657 > /dev/null 2>&1 &
Log: Forwarded cosmos-2-genesis-0: local 26653 -> target (host) 26657
kubectl port-forward pods/cosmos-2-genesis-0 1313:1317 > /dev/null 2>&1 &
Log: Forwarded cosmos-2-genesis-0: local 1313 -> target (host) 1317
kubectl port-forward pods/cosmos-2-genesis-0 26653:26657 > /dev/null 2>&1 &
Log: Forwarded cosmos-2-genesis-0: local 26653 -> target (host) 26657
kubectl port-forward pods/cosmos-2-genesis-0 8003:8000 > /dev/null 2>&1 &
Log: Forwarded cosmos-2-genesis-0: local 8003 -> target (host) 8000
kubectl port-forward service/registry 8081:8080 > /dev/null 2>&1 &
Expand All @@ -52,8 +52,8 @@ ps -ef | grep -i 'kubectl port-forward' | grep -v 'grep' | awk '{print $2}'
sleep 2
kubectl port-forward pods/osmosis-1-genesis-0 1317:6767676 > /dev/null 2>&1 &
kubectl port-forward pods/osmosis-1-genesis-0 8007:1000000 > /dev/null 2>&1 &
kubectl port-forward pods/cosmos-2-genesis-0 26653:26657 > /dev/null 2>&1 &
kubectl port-forward pods/cosmos-2-genesis-0 1313:1317 > /dev/null 2>&1 &
kubectl port-forward pods/cosmos-2-genesis-0 26653:26657 > /dev/null 2>&1 &
kubectl port-forward pods/cosmos-2-genesis-0 8003:8000 > /dev/null 2>&1 &
kubectl port-forward service/registry 8081:8080 > /dev/null 2>&1 &
kubectl port-forward service/registry 9091:9090 > /dev/null 2>&1 &
Expand Down
12 changes: 6 additions & 6 deletions clients/js/packages/client/__tests__/__snapshots__/client.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ Log: Trying to stop all port-forward, if any....
ps -ef | grep -i 'kubectl port-forward' | grep -v 'grep' | awk '{print $2}'
sleep 2
Log: Starting new port forwarding...
kubectl port-forward pods/osmosis-1-genesis-0 26657:26657 > /dev/null 2>&1 &
Log: Forwarded osmosis-1-genesis-0: local 26657 -> target (host) 26657
kubectl port-forward pods/osmosis-1-genesis-0 1317:1317 > /dev/null 2>&1 &
Log: Forwarded osmosis-1-genesis-0: local 1317 -> target (host) 1317
kubectl port-forward pods/osmosis-1-genesis-0 26657:26657 > /dev/null 2>&1 &
Log: Forwarded osmosis-1-genesis-0: local 26657 -> target (host) 26657
kubectl port-forward pods/osmosis-1-genesis-0 8007:8000 > /dev/null 2>&1 &
Log: Forwarded osmosis-1-genesis-0: local 8007 -> target (host) 8000
kubectl port-forward pods/cosmos-2-genesis-0 26653:26657 > /dev/null 2>&1 &
Log: Forwarded cosmos-2-genesis-0: local 26653 -> target (host) 26657
kubectl port-forward pods/cosmos-2-genesis-0 1313:1317 > /dev/null 2>&1 &
Log: Forwarded cosmos-2-genesis-0: local 1313 -> target (host) 1317
kubectl port-forward pods/cosmos-2-genesis-0 26653:26657 > /dev/null 2>&1 &
Log: Forwarded cosmos-2-genesis-0: local 26653 -> target (host) 26657
kubectl port-forward pods/cosmos-2-genesis-0 8003:8000 > /dev/null 2>&1 &
Log: Forwarded cosmos-2-genesis-0: local 8003 -> target (host) 8000
kubectl port-forward service/registry 8081:8080 > /dev/null 2>&1 &
Expand All @@ -50,11 +50,11 @@ helm search repo starship/devnet --version v0.2.3
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
ps -ef | grep -i 'kubectl port-forward' | grep -v 'grep' | awk '{print $2}'
sleep 2
kubectl port-forward pods/osmosis-1-genesis-0 26657:26657 > /dev/null 2>&1 &
kubectl port-forward pods/osmosis-1-genesis-0 1317:1317 > /dev/null 2>&1 &
kubectl port-forward pods/osmosis-1-genesis-0 26657:26657 > /dev/null 2>&1 &
kubectl port-forward pods/osmosis-1-genesis-0 8007:8000 > /dev/null 2>&1 &
kubectl port-forward pods/cosmos-2-genesis-0 26653:26657 > /dev/null 2>&1 &
kubectl port-forward pods/cosmos-2-genesis-0 1313:1317 > /dev/null 2>&1 &
kubectl port-forward pods/cosmos-2-genesis-0 26653:26657 > /dev/null 2>&1 &
kubectl port-forward pods/cosmos-2-genesis-0 8003:8000 > /dev/null 2>&1 &
kubectl port-forward service/registry 8081:8080 > /dev/null 2>&1 &
kubectl port-forward service/registry 9091:9090 > /dev/null 2>&1 &
Expand Down
36 changes: 17 additions & 19 deletions clients/js/packages/client/src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,25 +838,23 @@ export class StarshipClient implements StarshipClientI {
const chainPodPorts =
this.podPorts.chains[chain.name] || this.podPorts.chains.defaultPorts;

if (chain.cometmock?.enabled) {
if (chain.ports?.rpc)
this.forwardPortCometmock(
chain,
chain.ports.rpc,
chainPodPorts.cometmock
);
} else {
if (chain.ports?.rpc)
this.forwardPort(chain, chain.ports.rpc, chainPodPorts.rpc);
}
if (chain.ports?.rest)
this.forwardPort(chain, chain.ports.rest, chainPodPorts.rest);
if (chain.ports?.grpc)
this.forwardPort(chain, chain.ports.grpc, chainPodPorts.grpc);
if (chain.ports?.exposer)
this.forwardPort(chain, chain.ports.exposer, chainPodPorts.exposer);
if (chain.ports?.faucet)
this.forwardPort(chain, chain.ports.faucet, chainPodPorts.faucet);
Object.entries(chain.ports || {}).forEach(([portName, portValue]) => {
if (chainPodPorts[portName as keyof Ports]) {
if (chain.cometmock?.enabled && portName === 'rpc') {
this.forwardPortCometmock(
chain,
portValue,
chainPodPorts.cometmock
);
} else {
this.forwardPort(
chain,
portValue,
chainPodPorts[portName as keyof Ports]
);
}
}
});
});

this.config.relayers?.forEach((relayer) => {
Expand Down
1 change: 1 addition & 0 deletions starship/tests/e2e/configs/eth-lite.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ chains:
ports:
rest: 8545
rpc: 8551
ws: 8546
resources:
cpu: "200m"
memory: "200Mi"
Expand Down
Loading