added option to disable monitor installation (#506)

codefresh-io · Jun 18, 2020 · 2a46cee · 2a46cee
1 parent a7de550
commit 2a46cee
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 16 deletions.
diff --git a/lib/interface/cli/commands/hybrid/delete.cmd.js b/lib/interface/cli/commands/hybrid/delete.cmd.js
@@ -100,6 +100,11 @@ const deleteCmd = new Command({
         const [listAgentsErr, agents] = await to(sdk.agents.list({ }));
         await handleError(listAgentsErr, 'Failed to get agents');
 
+        if (!agents.length) {
+            console.log('No runners found on your codefresh account');
+            process.exit(0);
+        }
+
         console.log(colors.green('This uninstaller will guide you through the runner uninstallation process'));
 
         if (!kubeContextName) {

diff --git a/lib/interface/cli/commands/hybrid/init.cmd.js b/lib/interface/cli/commands/hybrid/init.cmd.js
@@ -108,6 +108,11 @@ const initCmd = new Command({
             describe: 'Run a demo pipeline after the installation completes',
             type: 'boolean',
         })
+        .option('install-monitor', {
+            describe: 'Install a monitoring component that will help provide valueable data about your cluster to Codefresh',
+            type: 'boolean',
+            default: true,            
+        })
         .option('kube-namespace', {
             describe: 'Name of the namespace on which venona should be installed [$CF_ARG_KUBE_NAMESPACE]',
         })
@@ -164,6 +169,7 @@ const initCmd = new Command({
             'set-value': setValue,
             'set-file': setFile,
             'skip-cluster-test': skipClusterTest,
+            'install-monitor': installMonitor,
         } = _argv;
         let {
             'kube-context-name': kubeContextName,
@@ -214,11 +220,11 @@ const initCmd = new Command({
             }
 
             if (_.isUndefined(shouldMakeDefaultRe)) {
-                if (_.get(sdk, 'config.context.isNoAuth') || await isNewAccount()) {
+                if (!_.get(sdk, 'config.context.isNoAuth') && await isNewAccount()) {
                     // don't ask and set this runtime as default if it's a new account
                     shouldMakeDefaultRe = true;
                 } else {
-                    let message = 'Set this as the default runtime environment for your Codefresh account? (Y/N)';
+                    let message = 'Set this as the default runtime environment for your Codefresh account?';
                     const [, defaultRe] = await to(getDefaultRuntime());
                     if (defaultRe) {
                         message = `Change the current default runtime "${colors.cyan(defaultRe.metadata.name)}" to new runtime ?`;
@@ -494,6 +500,7 @@ const initCmd = new Command({
             },
             successMessage: 'Successfully installed cluster monitoring',
             installationEvent: installationProgress.events.MONITOR_INSTALLED,
+            condition: installMonitor,
         });
 
         // Post Installation
@@ -545,7 +552,9 @@ 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`));
+        if (installMonitor) {
+            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/hybrid/migration.js b/lib/interface/cli/commands/hybrid/migration.js
@@ -49,6 +49,7 @@ async function migrate({
     runtimeName,
     kubeContextName,
     kubeNamespace,
+    installMonitor,
     agentName,
     handleError,
     kubeConfigPath,
@@ -151,18 +152,20 @@ async function migrate({
     handleError(agentInstallErr, 'Failed to install new agent and runtime');
 
     // Install new monitoring components
-    console.log('Installing monitoring components');
-    const monitorInstallOptions = {
-        'kube-config-path': kubeConfigPath,
-        'cluster-id': kubeContextName,
-        'kube-context-name': kubeContextName,
-        'kube-namespace': kubeNamespace,
-        token: _.get(sdk, 'config.context.token'),
-        verbose,
-        noExit: true, // to prevent if from calling inner: process.exit()
-    };
-    const [monitorErr] = await to(installMonitoring.handler(monitorInstallOptions));
-    await handleError(monitorErr, 'Monitor installation failed');
+    if (installMonitor) {
+        console.log('Installing monitoring components');
+        const monitorInstallOptions = {
+            'kube-config-path': kubeConfigPath,
+            'cluster-id': kubeContextName,
+            'kube-context-name': kubeContextName,
+            'kube-namespace': kubeNamespace,
+            token: _.get(sdk, 'config.context.token'),
+            verbose,
+            noExit: true, // to prevent if from calling inner: process.exit()
+        };
+        const [monitorErr] = await to(installMonitoring.handler(monitorInstallOptions));
+        await handleError(monitorErr, 'Monitor installation failed');
+    }
 
     // Execute test pipeline on new runner
     await createAndRunTestPipeline(runtimeName, handleError);

diff --git a/lib/interface/cli/commands/hybrid/upgrade.cmd.js b/lib/interface/cli/commands/hybrid/upgrade.cmd.js
@@ -62,13 +62,19 @@ const upgradeCmd = new Command({
         .option('kube-config-path', {
             describe: 'Path to kubeconfig file (default is $HOME/.kube/config)',
         })
+        .option('install-monitor', {
+            describe: 'Install a monitoring component that will help provide valueable data about your cluster to Codefresh (only useable when running migration)',
+            type: 'boolean',
+            default: true,
+        })
         .option('verbose', {
             describe: 'Print logs',
         }),
     handler: async (argv) => {
         const {
             'kube-config-path': kubeConfigPath,
             'agent-name': agentName,
+            'install-monitor': installMonitor,
             verbose,
         } = argv;
         let {
@@ -162,6 +168,7 @@ const upgradeCmd = new Command({
             agentName,
             agents,
             runtimeName,
+            installMonitor,
             verbose,
             handleError,
         }));

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.68.9",
+  "version": "0.68.10",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,