Saas 6146 (#441)

* create cluster when installing runtime
* install on codefresh namespace if namespace wasn't provided

Author: oren-codefresh

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

@@ -7,6 +7,8 @@ const { getKubeContext } = require('../../helpers/kubernetes');
 const ProgressEvents = require('../../helpers/progressEvents');
 const cliProgress = require('cli-progress');
 
+const defaultNamespace = 'codefresh';
+
 const installAgentCmd = new Command({
     root: false,
     parent: installRoot,
@@ -69,7 +71,6 @@ const installAgentCmd = new Command({
             'kube-node-selector': kubeNodeSelector,
             'dry-run': dryRun,
             'in-cluster': inCluster,
-            'kube-namespace': kubeNamespace,
             'kubernetes-runner-type': kubernetesRunnerType,
             tolerations,
             'venona-version': venonaVersion,
@@ -79,12 +80,15 @@ const installAgentCmd = new Command({
             verbose,
         } = argv;
         let agent;
-        let { 'kube-context-name': kubeContextName } = argv;
+        let {
+            'kube-context-name': kubeContextName,
+            'kube-namespace': kubeNamespace,
+        } = argv;
         if (!kubeContextName) {
             kubeContextName = getKubeContext(kubeConfigPath);
         }
         if (!kubeNamespace) {
-            throw new Error('kube-namespace is mandatory parameter');
+            kubeNamespace = defaultNamespace;
         }
 
         if (!token) { // Create an agent if not provided
@@ -113,10 +117,11 @@ const installAgentCmd = new Command({
         }
         const apiHost = sdk.config.context.url;
         const events = new ProgressEvents();
-        const format = 'downloading [{bar}] {percentage}% | {value}/{total}'; 
+        const format = 'downloading [{bar}] {percentage}% | {value}/{total}';
         const progressBar = new cliProgress.SingleBar({ stopOnComplete: true, format }, cliProgress.Presets.shades_classic);
         let totalSize;
         events.onStart((size) => {
+            console.log('Downloading agent\'s installer \n');
             progressBar.start(size, 0);
             totalSize = size;
         });

lib/interface/cli/commands/agent/uninstall.cmd.js

@@ -77,6 +77,7 @@ const unInstallAgentCmd = new Command({
             events,
         });
         if (exitCode === 0) {
+            console.log('Agent uninsalled successfully');
             await deleteAgent.handler({ name, id: name });
         }
         process.exit(0);

lib/interface/cli/commands/cluster/create.cmd.js

@@ -1,6 +1,8 @@
 const Command = require('../../Command');
 const createRoot = require('../root/create.cmd');
 const { sdk } = require('../../../../logic');
+const ProgressEvents = require('../../helpers/progressEvents');
+const cliProgress = require('cli-progress');
 
 const command = new Command({
     command: 'clusters [name]',
@@ -12,32 +14,30 @@ const command = new Command({
         title: 'Create Cluster',
         weight: 100,
     },
-    builder: (yargs) => {
-        return yargs
-            .option('kube-context', {
-                describe: ' kubectl context name',
-                alias: 'kc',
-                required: true,
-            })
-            .option('namespace', {
-                describe: 'Kubernetes namespace to use while looking for service account',
-                alias: 'ns',
-                default: 'default',
-                required: true,
-            })
-            .option('serviceaccount', {
-                describe: 'Kubernetes serviceaccount credentials to be added to Codefresh',
-                alias: 'sa',
-                default: 'default',
-                required: true,
-            })
-            .option('behind-firewall', {
-                describe: 'Specify if the cluster is set behind a firewall',
-                default: false,
-                type: 'boolean',
-            })
-            .example('codefresh create cluster --kube-context production', 'Creating a cluster in codefresh');
-    },
+    builder: yargs => yargs
+        .option('kube-context', {
+            describe: ' kubectl context name',
+            alias: 'kc',
+            required: true,
+        })
+        .option('namespace', {
+            describe: 'Kubernetes namespace to use while looking for service account',
+            alias: 'ns',
+            default: 'default',
+            required: true,
+        })
+        .option('serviceaccount', {
+            describe: 'Kubernetes serviceaccount credentials to be added to Codefresh',
+            alias: 'sa',
+            default: 'default',
+            required: true,
+        })
+        .option('behind-firewall', {
+            describe: 'Specify if the cluster is set behind a firewall',
+            default: false,
+            type: 'boolean',
+        })
+        .example('codefresh create cluster --kube-context production', 'Creating a cluster in codefresh'),
     handler: async (argv) => {
         const { context } = sdk.config;
         const {
@@ -47,13 +47,38 @@ const command = new Command({
             'behind-firewall': behindFirewall,
             name,
         } = argv;
+        let {
+            terminateProcess,
+        } = argv;
+        if (terminateProcess === undefined) {
+            terminateProcess = true;
+        }
+        const events = new ProgressEvents();
+        const format = 'downloading cluster installer  [{bar}] {percentage}% | {value}/{total}';
+        const progressBar = new cliProgress.SingleBar(
+            { stopOnComplete: true, format },
+            cliProgress.Presets.shades_classic,
+        );
+        let clusterTotalSize;
+        events.onStart((size) => {
+            progressBar.start(size, 0);
+            clusterTotalSize = size;
+        });
+        events.onProgress((progress) => {
+            progressBar.update(progress);
+            if (progress >= clusterTotalSize) {
+                console.log('\n');
+            }
+        });
         await sdk.clusters.create({
             contextName,
             context,
             namespace,
             serviceaccount,
             behindFirewall,
             name,
+            terminateProcess,
+            events,
         });
     },
 });

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

@@ -6,6 +6,9 @@ const installRoot = require('../root/install.cmd');
 const { getKubeContext } = require('../../helpers/kubernetes');
 const ProgressEvents = require('../../helpers/progressEvents');
 const cliProgress = require('cli-progress');
+const createClusterCmd = require('../cluster/create.cmd');
+
+const defaultNamespace = 'codefresh';
 
 
 const _getAgentData = async (token) => {
@@ -98,6 +101,9 @@ const installRuntimeCmd = new Command({
         .option('agent-kube-config-path', {
             describe: 'Path to kubeconfig file for the agent (default is $HOME/.kube/config) (on attach)',
         })
+        .option('cluster-service-account', {
+            describe: 'service account for cluster default is default',
+        })
         .option('verbose', {
             describe: 'Print logs',
         }),
@@ -106,7 +112,6 @@ const installRuntimeCmd = new Command({
             'storage-class-name': storageClassName,
             'agent-name': agentName,
             'dry-run': dryRun,
-            'runtime-kube-namespace': kubeNamespace,
             'in-cluster': inCluster,
             'kube-node-selector': kubeNodeSelector,
             'kubernetes-runner-type': kubernetesRunnerType,
@@ -116,25 +121,27 @@ const installRuntimeCmd = new Command({
             verbose,
             'build-annotations': buildAnnotations,
             'attach-runtime': attachRuntime,
+            'cluster-service-account': clusterServiceAccount,
         } = argv;
 
         let {
             'runtime-kube-context-name': kubeContextName,
             'agent-kube-context-name': agentKubeContextName,
             'agent-kube-namespace': agentKubeNamespace,
             'agent-kube-config-path': agentKubeConfigPath,
+            'runtime-kube-namespace': kubeNamespace,
             token,
         } = argv;
 
         if (!kubeNamespace) {
-            throw new Error('runtime-kube-namespace is mandatory parameter');
+            kubeNamespace = defaultNamespace;
         }
 
         // parse kubeNodeSelector in form key1=value1,key2=value2 to {key1: value1, key2: value2}
-        let kubeNodeSelectorObj = {};
+        const kubeNodeSelectorObj = {};
         if (kubeNodeSelector) {
             const nsSplitParts = kubeNodeSelector.split(',');
-            nsSplitParts.forEach( nsPart => {
+            nsSplitParts.forEach((nsPart) => {
                 const nsRecordSplit = nsPart.split('=');
                 if (nsRecordSplit.length !== 2) {
                     throw new Error('invalid kube-node-selector parameter');
@@ -166,19 +173,30 @@ const installRuntimeCmd = new Command({
             agent: true,
         });
         console.log(`Runtime envrionment ${runtimeName} was created`);
+
+        // create the cluster in codefresh
+
+        await createClusterCmd.handler({
+            'kube-context': kubeContextName,
+            namespace: kubeNamespace,
+            'behind-firewall': true,
+            serviceaccount: clusterServiceAccount || 'default',
+            terminateProcess: false,
+        });
         // install RE on cluster
 
-        const events = new ProgressEvents();
-        const format = 'downloading [{bar}] {percentage}% | {value}/{total}';
-        const progressBar = new cliProgress.SingleBar({ stopOnComplete: true, format }, cliProgress.Presets.shades_classic);
-        let totalSize;
-        events.onStart((size) => {
-            progressBar.start(size, 0);
-            totalSize = size;
+        const runtimeEvents = new ProgressEvents();
+        const runtimeFormat = 'downloading runtime installer  [{bar}] {percentage}% | {value}/{total}';
+        const runtimmrProgressBar = new cliProgress.SingleBar({ stopOnComplete: true, format: runtimeFormat }, cliProgress.Presets.shades_classic);
+        let runtimeTotalSize;
+        runtimeEvents.onStart((size) => {
+            console.log('Downloading runtime\'s installer \n');
+            runtimmrProgressBar.start(size, 0);
+            runtimeTotalSize = size;
         });
-        events.onProgress((progress) => {
-            progressBar.update(progress);
-            if (progress >= totalSize) {
+        runtimeEvents.onProgress((progress) => {
+            runtimmrProgressBar.update(progress);
+            if (progress >= runtimeTotalSize) {
                 console.log('\n');
             }
         });
@@ -198,7 +216,7 @@ const installRuntimeCmd = new Command({
             setValue,
             setFile,
             terminateProcess: !attachRuntime,
-            events,
+            events: runtimeEvents,
         });
         // attach RE to agent in codefresh
 

lib/interface/cli/commands/runtimeEnvironments/uninstall.cmd.js

@@ -30,6 +30,9 @@ const unInstallRuntimeCmd = new Command({
         .option('agent-name', {
             describe: 'Agent\'s name to be uninstalled',
         })
+        .option('name', {
+            describe: 'Runtime\'s name to be uninstalled',
+        })
         .option('agent-id', {
             describe: 'Agent\'s ID',
         })
@@ -58,7 +61,7 @@ const unInstallRuntimeCmd = new Command({
         const {
             'agent-name': agentName,
             'agent-id': agentId,
-            'runtime-name': runtimeName,
+            name: runtimeName,
             'runtime-kube-namespace': kubeNamespace,
             'runtime-kube-config-path': kubeConfigPath,
             'restart-agent': restartAgent,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.52.3",
+  "version": "0.52.4",
   "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.5.3",
+    "codefresh-sdk": "1.6.2",
     "colors": "^1.1.2",
     "columnify": "^1.5.4",
     "compare-versions": "^3.4.0",

yarn.lock

@@ -1187,10 +1187,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.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/codefresh-sdk/-/codefresh-sdk-1.5.3.tgz#77e3708d6cd4a9d0fe468b0749b8ac3754de99bb"
-  integrity sha512-4gGPHmyEqWxMcvY78XrjMkfA7WlriYOs43ak9YkIfApz6wxAcDy7B7qLwvKi/ZHDM25nwA1W4xrPQqm0ju7Usg==
+codefresh-sdk@1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/codefresh-sdk/-/codefresh-sdk-1.6.2.tgz#f8f196c0a53e7207bb9c474cab8147e4d8b53560"
+  integrity sha512-Slzy2OmzFGJnHbx7s9m1V/q/9Noo005Kw9c20y0A5A5Ne+5Islra1P5iplMbEP5oE47FutfhUn7QjNt3qAq5Bw==
   dependencies:
     bluebird "^3.5.3"
     cf-errors "^0.1.12"