diff --git a/lib/interface/cli/commands/agent/install.cmd.js b/lib/interface/cli/commands/agent/install.cmd.js index 9724612df..1eb4a5e55 100644 --- a/lib/interface/cli/commands/agent/install.cmd.js +++ b/lib/interface/cli/commands/agent/install.cmd.js @@ -84,6 +84,9 @@ const installAgentCmd = new Command({ .option('make-default-runtime', { describe: 'should all pipelines run on the hybrid runtime (default is false)', }) + .option('storage-class-name', { + describe: 'Set a name of your custom storage class, note: this will not install volume provisioning components', + }) .option('skip-cluster-test', { describe: 'Do not run cluster acceptance test', }) @@ -106,6 +109,7 @@ const installAgentCmd = new Command({ 'install-runtime': installRuntime, 'make-default-runtime': shouldMakeDefaultRe, 'skip-cluster-test': skipClusterTest, + 'storage-class-name': storageClassName, verbose, terminateProcess, } = argv; @@ -193,6 +197,7 @@ const installAgentCmd = new Command({ 'restart-agent': true, 'make-default-runtime': shouldMakeDefaultRe, 'skip-cluster-test': skipClusterTest, + 'storage-class-name': storageClassName, verbose, terminateProcess, }); diff --git a/lib/interface/cli/commands/hybrid/delete.cmd.js b/lib/interface/cli/commands/hybrid/delete.cmd.js index 73156662e..e580cc63e 100644 --- a/lib/interface/cli/commands/hybrid/delete.cmd.js +++ b/lib/interface/cli/commands/hybrid/delete.cmd.js @@ -83,7 +83,7 @@ const deleteCmd = new Command({ questions.push({ type: 'list', name: 'name', - message: 'Runner manager name to uninstall', + message: 'Agent name to uninstall', choices: agents, }); } @@ -95,7 +95,7 @@ const deleteCmd = new Command({ // check that agent exists const agent = _.find(agents, curr => curr.name === agentName); if (!agent) { - console.log(colors.red(`Runner Manager with name ${agentName} doesn\'t exists`)); + console.log(colors.red(`Agent with name ${agentName} doesn\'t exists`)); return; } if (agent.runtimes && agent.runtimes > 1) { diff --git a/lib/interface/cli/commands/hybrid/init.cmd.js b/lib/interface/cli/commands/hybrid/init.cmd.js index b56c4c324..efd4288b5 100644 --- a/lib/interface/cli/commands/hybrid/init.cmd.js +++ b/lib/interface/cli/commands/hybrid/init.cmd.js @@ -103,6 +103,7 @@ async function createAndExecuteDemoPipeline(runtimeName, progressReporter) { const [pipelineExecutionError] = await to(pipelinesRunCmd.handler({ name: INSTALLATION_DEFAULTS.DEMO_PIPELINE_NAME, exitProcess: false, + annotation: [], })); await handleError(pipelineExecutionError, 'Failed to run demo pipeline', progressReporter, installationProgress.events.PIPELINE_EXECUTED); @@ -195,6 +196,9 @@ const initCmd = new Command({ .option('tolerations', { describe: 'The kubernetes tolerations as path to a JSON file to be used by venona resources (default is no tolerations) (string)', }) + .option('storage-class-name', { + describe: 'Set a name of your custom storage class', + }) .option('venona-version', { describe: 'Version of venona to install (default is the latest)', }) @@ -217,6 +221,7 @@ const initCmd = new Command({ 'venona-version': venonaVersion, 'kube-config-path': kubeConfigPath, 'skip-version-check': skipVersionCheck, + 'storage-class-name': storageClassName, yes: noQuestions, verbose, name, url, @@ -347,6 +352,7 @@ const initCmd = new Command({ 'install-runtime': true, verbose, 'make-default-runtime': shouldMakeDefaultRe, + 'storage-class-name': storageClassName, terminateProcess: false, }; const [err, runtimeName] = await to(installAgent.handler(agentInstallOptions)); @@ -373,6 +379,7 @@ const initCmd = new Command({ console.log(colors.green('\nRunner Status:')); await getAgents.handler({}); + console.log(colors.green(`\nGo to ${colors.blue('https://g.codefresh.io/kubernetes/monitor/services')} to view your cluster in codefresh dashbaord`)); console.log(colors.green(`\nDocumenation link: ${colors.blue('https://codefresh.io/docs/docs/enterprise/codefresh-runner/#codefresh-runner-preview-release')}`)); console.log(colors.green(`If you had any issues with the installation please report them at: ${colors.blue('https://github.com/codefresh-io/cli/issues/new')}`)); await to(progressReporter.report(installationProgress.events.FINISHED, installationProgress.status.SUCCESS)); diff --git a/lib/interface/cli/commands/runtimeEnvironments/install.cmd.js b/lib/interface/cli/commands/runtimeEnvironments/install.cmd.js index d23679221..f94ed373e 100644 --- a/lib/interface/cli/commands/runtimeEnvironments/install.cmd.js +++ b/lib/interface/cli/commands/runtimeEnvironments/install.cmd.js @@ -231,6 +231,7 @@ const installRuntimeCmd = new Command({ terminateProcess: !attachRuntime, events: runtimeEvents, skipClusterTest, + storageClassName, }); // attach RE to agent in codefresh diff --git a/package.json b/package.json index 175b623f2..0587305f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codefresh", - "version": "0.63.0", + "version": "0.63.2", "description": "Codefresh command line utility", "main": "index.js", "preferGlobal": true, @@ -37,7 +37,7 @@ "cf-errors": "^0.1.12", "chalk": "^1.1.3", "cli-progress": "3.6.0", - "codefresh-sdk": "1.8.4", + "codefresh-sdk": "1.8.5", "colors": "^1.1.2", "columnify": "^1.5.4", "compare-versions": "^3.4.0", diff --git a/yarn.lock b/yarn.lock index c0d5cedbb..6f09242e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1242,10 +1242,10 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -codefresh-sdk@1.8.4: - version "1.8.4" - resolved "https://registry.yarnpkg.com/codefresh-sdk/-/codefresh-sdk-1.8.4.tgz#aac884bc9212b0af4036a933c4304318606616f5" - integrity sha512-+qFBae8M9pb6qRZrHzecw7spVZOLWpbQ/pxyBriGuE7PWBzB4nh4x6eb/R/sP41GA1q5WjwNc1KH4yWwGbV4HA== +codefresh-sdk@1.8.5: + version "1.8.5" + resolved "https://registry.yarnpkg.com/codefresh-sdk/-/codefresh-sdk-1.8.5.tgz#8c77d5244fe95a49880a83822892fbdbbb21f850" + integrity sha512-TwS2H1+o/n7RY7OQ+kZSpjz/EPTnKmbGcr9wSdkGgoErfU1fNq4y1ALW6Icvh6v7vULZHfJqd8V+dUGFhph6CQ== dependencies: bluebird "^3.5.3" cf-errors "^0.1.12"