Skip to content

add values support for app-proxy and monitor #564

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
merged 1 commit into from
Oct 5, 2020
Merged

add values support for app-proxy and monitor #564

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
4 changes: 4 additions & 0 deletions lib/interface/cli/commands/hybrid/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,7 @@ async function installAppProxy({
kubeConfigPath, // --kube-config-path
verbose, // --verbose
logFormatting = DefaultLogFormatter, // --log-formtter
valuesFile, // --values
}) {
const binLocation = await downloadVeonona();
const componentRunner = new Runner(binLocation);
Expand All @@ -648,6 +649,9 @@ async function installAppProxy({
if (process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
cmd.push('--insecure');
}
if (valuesFile) {
cmd.push(`--values=${valuesFile}`);
}
const cp = componentRunner.runAndAttach(components.venona, cmd, true);
const chunks = [];
let ingressIp;
Expand Down
2 changes: 2 additions & 0 deletions lib/interface/cli/commands/hybrid/init.cmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,7 @@ const initCmd = new Command({
kubeNamespace,
verbose,
kubeConfigPath,
valuesFile,
});
installationPlan.addContext('appProxyIP', `http://${appProxyIP}`);
},
Expand Down Expand Up @@ -683,6 +684,7 @@ const initCmd = new Command({
verbose,
noExit: true, // to prevent if from calling inner: process.exit()
url,
values: valuesFile,
},
successMessage: 'Successfully installed cluster monitoring',
installationEvent: installationProgress.events.MONITOR_INSTALLED,
Expand Down
7 changes: 7 additions & 0 deletions lib/interface/cli/commands/monitor/install.cmd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ const installMonitorCmd = new Command({
describe: 'The prefix for the container registry that will be used for pulling the required components images. Example: --docker-registry="docker.io"',
type: 'string',
})
.option('values', {
describe: 'specify values in a YAML file',
})
.option('verbose', {
describe: 'Print logs',
}),
Expand All @@ -50,6 +53,7 @@ const installMonitorCmd = new Command({
'kube-namespace': kubeNamespace,
'docker-registry': dockerRegistry,
verbose,
values: valuesFile,
// noExit,
} = argv;
const binLocation = await downloadVeonona();
Expand Down Expand Up @@ -98,6 +102,9 @@ const installMonitorCmd = new Command({
if (dockerRegistry) {
commands.push(`--docker-registry=${dockerRegistry}`);
}
if (valuesFile) {
commands.push(`--values=${valuesFile}`);
}

await componentRunner.run(components.venona, commands);
},
Expand Down