Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@

exports[`StarshipClient setup 1`] = `
"Call: setConfig({"name":"starship","version":"v0.2.3","chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}})
Log: No version specified, using default version: v1.8.0
Log: config again: [object Object]
Call: saveConfig()
Call: savePodPorts("../../__output__/default-pod-ports.yaml")
Call: setup()
helm repo add starship https://hyperweb-io.github.io/starship/
helm repo update
helm search repo starship/devnet --version v0.2.3
helm search repo starship/devnet --version v1.8.0
Call: deploy()
Log: Installing the helm chart. This is going to take a while.....
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v1.8.0 --timeout 10m
Log: Run "starship get-pods" to check the status of the cluster
Call: startPortForward()
Log: Attempting to stop any existing port-forwards...
Expand Down Expand Up @@ -48,8 +49,8 @@ Log: All pods have been successfully terminated!"
exports[`StarshipClient setup 2`] = `
"helm repo add starship https://hyperweb-io.github.io/starship/
helm repo update
helm search repo starship/devnet --version v0.2.3
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
helm search repo starship/devnet --version v1.8.0
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v1.8.0 --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 1317:1317 > /dev/null 2>&1 &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@

exports[`StarshipClient setup 1`] = `
"Call: setConfig({"name":"starship","version":"v0.2.3","chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}})
Log: No version specified, using default version: v1.8.0
Log: config again: [object Object]
Call: setPodPorts({"chains":{"osmosis":{"exposer":98988,"faucet":1000000,"grpc":909090,"rest":6767676}}})
Call: savePodPorts("../../__output__/custom-pod-ports.yaml")
Call: setup()
helm repo add starship https://hyperweb-io.github.io/starship/
helm repo update
helm search repo starship/devnet --version v0.2.3
helm search repo starship/devnet --version v1.8.0
Call: deploy()
Log: Installing the helm chart. This is going to take a while.....
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v1.8.0 --timeout 10m
Log: Run "starship get-pods" to check the status of the cluster
Call: startPortForward()
Log: Attempting to stop any existing port-forwards...
Expand Down Expand Up @@ -46,8 +47,8 @@ Log: All pods have been successfully terminated!"
exports[`StarshipClient setup 2`] = `
"helm repo add starship https://hyperweb-io.github.io/starship/
helm repo update
helm search repo starship/devnet --version v0.2.3
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
helm search repo starship/devnet --version v1.8.0
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v1.8.0 --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 1317:6767676 > /dev/null 2>&1 &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

exports[`StarshipClient setup 1`] = `
"Call: setConfig({"name":"starship","version":"v0.2.3","chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}})
Log: No version specified, using default version: v1.8.0
Log: config again: [object Object]
Call: setup()
helm repo add starship https://hyperweb-io.github.io/starship/
helm repo update
helm search repo starship/devnet --version v0.2.3
helm search repo starship/devnet --version v1.8.0
Call: deploy()
Log: Installing the helm chart. This is going to take a while.....
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v1.8.0 --timeout 10m
Log: Run "starship get-pods" to check the status of the cluster
Call: startPortForward()
Log: Attempting to stop any existing port-forwards...
Expand Down Expand Up @@ -46,8 +47,8 @@ Log: All pods have been successfully terminated!"
exports[`StarshipClient setup 2`] = `
"helm repo add starship https://hyperweb-io.github.io/starship/
helm repo update
helm search repo starship/devnet --version v0.2.3
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
helm search repo starship/devnet --version v1.8.0
helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v1.8.0 --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 1317:1317 > /dev/null 2>&1 &
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

exports[`StarshipClient verify should handle explorer verification failure 1`] = `
"Call: setConfig({"name":"osmojs","version":"v0.2.3","chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}})
Log: No version specified, using default version: v1.8.0
Log: config again: [object Object]
Call: verify()
Log: Verifying services...
Expand All @@ -26,6 +27,7 @@ exports[`StarshipClient verify should handle explorer verification failure 2`] =

exports[`StarshipClient verify should handle registry verification failure 1`] = `
"Call: setConfig({"name":"osmojs","version":"v0.2.3","chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}})
Log: No version specified, using default version: v1.8.0
Log: config again: [object Object]
Call: verify()
Log: Verifying services...
Expand All @@ -50,6 +52,7 @@ exports[`StarshipClient verify should handle registry verification failure 2`] =

exports[`StarshipClient verify should handle relayer verification failure 1`] = `
"Call: setConfig({"name":"osmojs","version":"v0.2.3","chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}})
Log: No version specified, using default version: v1.8.0
Log: config again: [object Object]
Call: verify()
Log: Verifying services...
Expand All @@ -74,6 +77,7 @@ exports[`StarshipClient verify should handle relayer verification failure 2`] =

exports[`StarshipClient verify should skip disabled services 1`] = `
"Call: setConfig({"name":"osmojs","version":"v0.2.3","chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":false,"ports":{"rest":8081,"grpc":9091}},"explorer":{"enabled":false}})
Log: No version specified, using default version: v1.8.0
Log: config again: [object Object]
Call: verify()
Log: Verifying services...
Expand All @@ -97,6 +101,7 @@ exports[`StarshipClient verify should skip disabled services 2`] = `""`;

exports[`StarshipClient verify should verify all services successfully 1`] = `
"Call: setConfig({"name":"starship","version":"v0.2.3","chains":[{"id":"osmosis-1","name":"osmosis","image":"pyramation/osmosis:v16.1.0","numValidators":1,"ports":{"rest":1317,"rpc":26657,"faucet":8007}},{"id":"cosmos-2","name":"cosmos","numValidators":1,"ports":{"rest":1313,"rpc":26653,"faucet":8003}}],"relayers":[{"name":"osmos-cosmos","type":"hermes","replicas":1,"chains":["osmosis-1","cosmos-2"]}],"registry":{"enabled":true,"ports":{"rest":8081,"grpc":9091}}})
Log: No version specified, using default version: v1.8.0
Log: config again: [object Object]
Call: verify()
Log: Verifying services...
Expand Down
18 changes: 4 additions & 14 deletions packages/packages/client/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,6 @@ export class StarshipClient implements StarshipClientI {
if (this.ctx.name) {
this.config.name = this.ctx.name;
}
if (this.ctx.version) {
this.config.version = this.ctx.version;
}

// Use default name and version if not provided
if (!this.config.name) {
Expand All @@ -314,13 +311,13 @@ export class StarshipClient implements StarshipClientI {
);
this.config.name = defaultName;
}
if (!this.config.version) {
if (!this.ctx.version) {
this.log(
chalk.yellow(
'No version specified, using default version: ' + defaultVersion
)
);
this.config.version = defaultVersion;
this.ctx.version = defaultVersion;
}

this.log('config again: ' + this.config);
Expand Down Expand Up @@ -375,14 +372,7 @@ export class StarshipClient implements StarshipClientI {
});
this.exec(['helm', 'repo', 'update'], { ignoreError: false });
this.exec(
[
'helm',
'search',
'repo',
this.ctx.chart,
'--version',
this.config.version
],
['helm', 'search', 'repo', this.ctx.chart, '--version', this.ctx.version],
{ ignoreError: false }
);
}
Expand All @@ -408,7 +398,7 @@ export class StarshipClient implements StarshipClientI {
this.config.name,
this.ctx.chart,
'--version',
this.config.version,
this.ctx.version,
'--timeout',
this.ctx.timeout,
...this.getDeployArgs(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: keys
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: configmap
app.kubernetes.io/part-of: global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: setup-scripts
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: configmap
app.kubernetes.io/part-of: global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: explorer
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: explorer
app.kubernetes.io/part-of: starship
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: explorer
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: explorer
app.kubernetes.io/part-of: starship
Expand All @@ -27,7 +27,7 @@ spec:
app.kubernetes.io/type: ping-pub
app.kubernetes.io/name: explorer
app.kubernetes.io/rawname: explorer
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
spec:
containers:
- name: explorer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: explorer
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: explorer
app.kubernetes.io/part-of: starship
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: core-1-genesis
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: chain
app.kubernetes.io/part-of: core-1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: core-1-genesis
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: chain
app.kubernetes.io/part-of: core-1
Expand Down Expand Up @@ -33,7 +33,7 @@ spec:
app.kubernetes.io/type: core-1
app.kubernetes.io/name: core-1-genesis
app.kubernetes.io/rawname: core-1
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/role: genesis
spec:
initContainers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: setup-scripts-core-1
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: chain
app.kubernetes.io/name: persistencecore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: core-1-validator
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: chain
app.kubernetes.io/part-of: core-1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: core-1-validator
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: chain
app.kubernetes.io/part-of: core-1
Expand Down Expand Up @@ -33,7 +33,7 @@ spec:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/type: core-1
app.kubernetes.io/name: core-1-validator
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/role: validator
spec:
initContainers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: registry-config
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: registry
app.kubernetes.io/part-of: starship
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: registry
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: registry
app.kubernetes.io/part-of: starship
Expand All @@ -18,7 +18,7 @@ spec:
labels:
app: registry
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
spec:
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: registry
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: registry
app.kubernetes.io/part-of: starship
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: keys
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: configmap
app.kubernetes.io/part-of: global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: setup-scripts
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: configmap
app.kubernetes.io/part-of: global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: cosmoshub-4-genesis
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: chain
app.kubernetes.io/part-of: cosmoshub-4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: cosmoshub-4-genesis
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: chain
app.kubernetes.io/part-of: cosmoshub-4
Expand Down Expand Up @@ -33,7 +33,7 @@ spec:
app.kubernetes.io/type: cosmoshub-4
app.kubernetes.io/name: cosmoshub-4-genesis
app.kubernetes.io/rawname: cosmoshub-4
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/role: genesis
spec:
initContainers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: setup-scripts-cosmoshub-4
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: chain
app.kubernetes.io/name: cosmoshub
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: explorer
labels:
app.kubernetes.io/instance: starship-generator-test
app.kubernetes.io/version: 4.0.0
app.kubernetes.io/version: 4.0.0-alpha.0
app.kubernetes.io/managed-by: starship
app.kubernetes.io/component: explorer
app.kubernetes.io/part-of: starship
Expand Down
Loading