fix cluster integration created by monitor components (#625)

* fix cluster integration created by monitor components

* ci

Author: roi-codefresh

lib/interface/cli/commands/hybrid/init.cmd.js

@@ -636,7 +636,7 @@ const initCmd = new Command({
             installationEvent: installationProgress.events.CLUSTER_INTEGRATION_ADDED,
             condition: async () => {
                 if (isInCluster()) {
-                    console.log('Cluster integration was not added , please add it via codefresh create clusters [name] ');
+                    console.log('Cluster integration was not added , please add it via codefresh "create clusters [name]"');
                     return false;
                 }
                 const clusters = await sdk.clusters.list() || [];
@@ -778,7 +778,18 @@ const initCmd = new Command({
             },
             successMessage: 'Successfully installed cluster monitoring',
             installationEvent: installationProgress.events.MONITOR_INSTALLED,
-            condition: installMonitor,
+            condition: async () => {
+                if (!installMonitor) {
+                    return false;
+                }
+
+                if (isInCluster()) {
+                    console.log('Monitor component cannot be installed without cluster integration, you can install it seperately using: "codefresh install monitor"');
+                    return false;
+                }
+
+                return true;
+            },
         });
 
         // Post Installation

lib/interface/cli/commands/monitor/install.cmd.js

@@ -4,6 +4,7 @@ const installRoot = require('../root/install.cmd');
 const { DefaultLogFormatter } = require('./../hybrid/helper');
 const { downloadVeonona } = require('../hybrid/helper');
 const { Runner, components } = require('../../../../binary');
+const sdk = require('../../../../logic/sdk');
 const _ = require('lodash');
 
 const installMonitorCmd = new Command({
@@ -77,9 +78,11 @@ const installMonitorCmd = new Command({
             commands.push(clusterId);
         }
 
+        commands.push('--codefreshToken');
         if (token) {
-            commands.push('--codefreshToken');
             commands.push(token);
+        } else {
+            commands.push(_.get(sdk, 'config.context.token'));
         }
 
         if (kubeConfigPath) {

lib/interface/cli/helpers/kubernetes.js

@@ -17,9 +17,7 @@ const _getKubeConfig = (kubeconfigPath) => {
     return kc;
 };
 
-const isInCluster = () => {
-    return fs.existsSync('/var/run/secrets/kubernetes.io/serviceaccount');
-};
+const isInCluster = () => fs.existsSync('/var/run/secrets/kubernetes.io/serviceaccount');
 
 const getKubeContext = (kubeconfigPath) => {
     const kubeconfig = _getKubeConfig(kubeconfigPath);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.74.5",
+  "version": "0.74.6",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,