Skip to content
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

fix(cli): encapsulate helm and kubectl commands and code cleanup #476

Merged
merged 5 commits into from
Nov 1, 2023
Merged

fix(cli): encapsulate helm and kubectl commands and code cleanup #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c70a8f
feat: encapsulate helm and kubectl commands
leninmehedy Nov 1, 2023
5de115c
fix: cleanup charts command
leninmehedy Nov 1, 2023
83b7f92
fix: tests
leninmehedy Nov 1, 2023
8186bc4
fix: capture error stack while running shell command
leninmehedy Nov 1, 2023
2c24fa0
fix: use correct error variable name and code cleanup
leninmehedy Nov 1, 2023
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
97 changes: 37 additions & 60 deletions fullstack-network-manager/src/commands/base.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ export class BaseCommand extends ShellRunner {
this.logger.debug(cmd)
await this.run(cmd)
} catch (e) {
this.logger.error("%s", e)
this.logger.showUserError(e)
return false
}

return true
}

/**
* Check if 'kind' CLI program is installed or not
* @returns {Promise<boolean>}
Expand Down Expand Up @@ -77,105 +78,81 @@ export class BaseCommand extends ShellRunner {
*/
async getInstalledCharts(namespaceName) {
try {
let cmd = `helm list -n ${namespaceName} -q`

let output = await this.run(cmd)
this.logger.showUser("\nList of installed charts\n--------------------------\n%s", output)

return output.split(/\r?\n/)
return await this.helm.list(`-n ${namespaceName}`, '-q')
} catch (e) {
this.logger.error("%s", e)
this.logger.showUser(e.message)
this.logger.showUserError(e)
}

return []
}

async chartInstall(namespaceName, releaseName, chartPath, valuesArg) {
async chartInstall(namespaceName, chartName, chartPath, valuesArg = '') {
try {
this.logger.showUser(chalk.cyan(`Setting up FST network...`))

let charts= await this.getInstalledCharts(namespaceName)
if (!charts.includes(releaseName)) {
let cmd = `helm install -n ${namespaceName} ${releaseName} ${chartPath} ${valuesArg}`
this.logger.showUser(chalk.cyan(`Installing ${releaseName} chart`))

let output = await this.run(cmd)
this.logger.showUser(chalk.green('OK'), `chart '${releaseName}' is installed`)
let charts = await this.getInstalledCharts(namespaceName)
if (!charts.includes(chartName)) {
this.logger.showUser(chalk.cyan('> running helm dependency update for chart:'), chalk.yellow(`${chartName} ...`))
await this.helm.dependency('update', chartPath)

this.logger.showUser(chalk.cyan('> installing chart:'), chalk.yellow(`${chartName}`))
await this.helm.install(`-n ${namespaceName} ${chartName} ${chartPath} ${valuesArg}`)
this.logger.showUser(chalk.green('OK'), `chart '${chartName}' is installed`)
} else {
this.logger.showUser(chalk.green('OK'), `chart '${releaseName}' is already installed`)
this.logger.showUser(chalk.green('OK'), `chart '${chartName}' is already installed`)
}

this.logger.showUser(chalk.yellow("Chart setup is complete"))

return true
} catch (e) {
this.logger.error("%s", e.stack)
this.logger.showUser(e.message)
this.logger.showUserError(e)
}

return false
}

async chartUninstall(namespaceName, releaseName) {
async chartUninstall(namespaceName, chartName) {
try {
this.logger.showUser(chalk.cyan(`Uninstalling FST network ...`))

let charts= await this.getInstalledCharts(namespaceName)
if (charts.includes(releaseName)) {
let cmd = `helm uninstall ${releaseName} -n ${namespaceName}`
this.logger.showUser(chalk.cyan(`Uninstalling ${releaseName} chart`))

let output = await this.run(cmd)
this.logger.showUser(chalk.green('OK'), `chart '${releaseName}' is uninstalled`)
await this.getInstalledCharts(namespaceName)
this.logger.showUser(chalk.cyan('> checking chart:'), chalk.yellow(`${chartName}`))
let charts = await this.getInstalledCharts(namespaceName)
if (charts.includes(chartName)) {
this.logger.showUser(chalk.cyan('> uninstalling chart:'), chalk.yellow(`${chartName}`))
await this.helm.uninstall(`-n ${namespaceName} ${chartName}`)
this.logger.showUser(chalk.green('OK'), `chart '${chartName}' is uninstalled`)
} else {
this.logger.showUser(chalk.green('OK'), `chart '${releaseName}' is already uninstalled`)
this.logger.showUser(chalk.green('OK'), `chart '${chartName}' is already uninstalled`)
}

this.logger.showUser(chalk.yellow("Chart uninstallation is complete"))

return true
} catch (e) {
this.logger.error("%s", e.stack)
this.logger.showUser(e.message)
this.logger.showUserError(e)
}

return false
}

async chartUpgrade(namespaceName, releaseName, chartPath, valuesArg) {
async chartUpgrade(namespaceName, chartName, chartPath, valuesArg = '') {
try {
this.logger.showUser(chalk.cyan(`Upgrading FST network deployment chart ...`))

let charts= await this.getInstalledCharts(namespaceName)
if (charts.includes(releaseName)) {
let cmd = `helm upgrade ${releaseName} -n ${namespaceName} ${chartPath} ${valuesArg}`
this.logger.showUser(chalk.cyan(`Upgrading ${releaseName} chart`))

let output = await this.run(cmd)
this.logger.showUser(chalk.green('OK'), `chart '${releaseName}' is upgraded`)
await this.getInstalledCharts(namespaceName)

this.logger.showUser(chalk.yellow("Chart upgrade is complete"))
} else {
this.logger.showUser(chalk.green('OK'), `chart '${releaseName}' is not installed`)
return false
}
this.logger.showUser(chalk.cyan('> upgrading chart:'), chalk.yellow(`${chartName}`))
await this.helm.upgrade(`-n ${namespaceName} ${chartName} ${chartPath} ${valuesArg}`)
this.logger.showUser(chalk.green('OK'), `chart '${chartName}' is upgraded`)

return true
} catch (e) {
this.logger.error("%s", e.stack)
this.logger.showUser(e.message)
this.logger.showUserError(e)
}

return false
}


constructor(opts) {
super(opts);

if (!opts || !opts.kind) throw new Error('An instance of core/Kind is required')
if (!opts || !opts.helm) throw new Error('An instance of core/Helm is required')
if (!opts || !opts.kubectl) throw new Error('An instance of core/Kubectl is required')

this.kind = opts.kind
this.helm = opts.helm
this.kubectl = opts.kubectl

// map of dependency checks
this.checks = new Map()
.set(core.constants.KIND, () => this.checkKind())
Expand Down
9 changes: 4 additions & 5 deletions fullstack-network-manager/src/commands/chart.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as flags from "./flags.mjs";

export class ChartCommand extends BaseCommand {
chartPath = `${core.constants.FST_HOME_DIR}/full-stack-testing/charts/fullstack-deployment`
releaseName = "fullstack-deployment"
chartName = "fullstack-deployment"

prepareValuesArg(argv) {
let {valuesFile, mirrorNode, hederaExplorer} = argv
Expand All @@ -25,21 +25,20 @@ export class ChartCommand extends BaseCommand {
let namespace = argv.namespace
let valuesArg = this.prepareValuesArg(argv)

await this.run(`helm dependency update ${this.chartPath}`)
return await this.chartInstall(namespace, this.releaseName, this.chartPath, valuesArg)
return await this.chartInstall(namespace, this.chartName, this.chartPath, valuesArg)
}

async uninstall(argv) {
let namespace = argv.namespace

return await this.chartUninstall(namespace, this.releaseName)
return await this.chartUninstall(namespace, this.chartName)
}

async upgrade(argv) {
let namespace = argv.namespace
let valuesArg = this.prepareValuesArg(argv)

return await this.chartUpgrade(namespace, this.releaseName, this.chartPath, valuesArg)
return await this.chartUpgrade(namespace, this.chartName, this.chartPath, valuesArg)
}

static getCommandDefinition(chartCmd) {
Expand Down
Loading