Skip to content

Commit

Permalink
Merge commit '1973275bd7e1a6da19e26c32e396d21cd4229d9f' into 00742-D-…
Browse files Browse the repository at this point in the history
…rm-nextNodeID

Signed-off-by: Jeffrey Tang <[email protected]>

# Conflicts:
#	version.ts
  • Loading branch information
JeffreyDallas committed Nov 6, 2024
2 parents 0a22a65 + 1973275 commit c92d766
Show file tree
Hide file tree
Showing 11 changed files with 64 additions and 223 deletions.
253 changes: 44 additions & 209 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"@types/ip": "^1.1.3",
"@types/mocha": "^10.0.9",
"@types/mocha-each": "^2.0.4",
"@types/node": "^22.8.7",
"@types/node": "^22.9.0",
"@types/semver": "^7.5.8",
"@types/sinon": "^17.0.3",
"@types/sinon-chai": "^4.0.0",
Expand Down Expand Up @@ -124,7 +124,7 @@
"sinon-chai": "^4.0.0",
"typedoc": "^0.26.11",
"typescript": "^5.6.3",
"typescript-eslint": "^8.12.2"
"typescript-eslint": "^8.13.0"
},
"repository": {
"type": "git",
Expand Down
8 changes: 6 additions & 2 deletions src/commands/cluster.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,15 @@ export class ClusterCommand extends BaseCommand {
const clusterSetupNamespace = ctx.config.clusterSetupNamespace
const version = ctx.config.soloChartVersion

const chartPath = ctx.chartPath
const chartPath = constants.SOLO_TESTING_CHART_URL + constants.SOLO_CLUSTER_SETUP_CHART
const valuesArg = ctx.valuesArg

try {
await self.chartManager.install(clusterSetupNamespace, constants.SOLO_CLUSTER_SETUP_CHART, chartPath, version, valuesArg)
self.logger.debug(`Installing chart chartPath = ${chartPath}, version = ${version}`)
await self.chartManager.install(clusterSetupNamespace,
constants.SOLO_CLUSTER_SETUP_CHART,
chartPath,
version, valuesArg)
} catch (e: Error | any) {
// if error, uninstall the chart and rethrow the error
self.logger.debug(`Error on installing ${constants.SOLO_CLUSTER_SETUP_CHART}. attempting to rollback by uninstalling the chart`, e)
Expand Down
Loading

0 comments on commit c92d766

Please sign in to comment.