fix figlet and node selector (#519)

* fix figlet and node selector

Author: oren-codefresh

lib/interface/cli/commands/hybrid/helper.js

@@ -16,6 +16,7 @@ const {
     CODEFRESH_PATH,
 } = require('./../../../../binary');
 const { pathExists } = require('../../helpers/general');
+const Promise = require('bluebird');
 
 const INSTALLATION_DEFAULTS = {
     NAMESPACE: 'codefresh',
@@ -272,15 +273,15 @@ function createProgressBar() {
 }
 
 function drawCodefreshFiglet() {
-    return new Promise((resolve) => {
+    return Promise.race(new Promise((resolve) => {
         figlet('CODEFRESH', (err, data) => {
             if (err) {
                 return;
             }
             console.log(data);
             resolve();
         });
-    });
+    }), Promise.delay(5000));
 }
 
 async function getDefaultRuntime(runtimes) {

lib/interface/cli/commands/hybrid/migration.js

@@ -15,8 +15,18 @@ const {
 } = require('./helper');
 const { getNewAgentName } = require('../agent/helper');
 
+
 const TEST_PIPELINE_NAME = 'CF_Runner_Migration_test';
 
+function serealizeNodeSelector(objNodeSelector) {
+    return _.keys(objNodeSelector).reduce((acc, key) => {
+        if (acc) {
+            return `${acc},${key}=${objNodeSelector[key]}`;
+        }
+        return `${key}=${objNodeSelector[key]}`;
+    }, '');
+}
+
 async function createAndRunTestPipeline(runtimeName, errHandler) {
     let testPipeline;
     const [getPipelineErr, _testPipeline] = await to(getTestPipeline(TEST_PIPELINE_NAME));
@@ -63,7 +73,7 @@ async function migrate({
     const newAgentName = agentName || await getNewAgentName(kubeContextName, kubeNamespace, agents);
     const [getRuntimeErr, runtime] = await to(sdk.runtimeEnvs.get({ name: runtimeName }));
     handleError(getRuntimeErr, `Failed to get runtime with name "${runtimeName}"`);
-    const oldNodeSelector = _.get(runtime, 'runtimeScheduler.cluster.nodeSelector');
+    let oldNodeSelector = _.get(runtime, 'dockerDaemonScheduler.cluster.nodeSelector');
     const oldStorageClassName = _.get(runtime, 'dockerDaemonScheduler.pvcs.dind.storageClassName');
 
     // prompt migration process confirmation
@@ -121,8 +131,11 @@ async function migrate({
     }
 
     if (oldConfig.nodeSelector) {
-        const key = _.keys(oldConfig.nodeSelector)[0];
-        oldConfig.nodeSelector = `${key}=${oldConfig.nodeSelector[key]}`;
+        oldConfig.nodeSelector = serealizeNodeSelector(oldConfig.nodeSelector);
+    }
+
+    if (oldNodeSelector) {
+        oldNodeSelector = serealizeNodeSelector(oldNodeSelector);
     }
 
     // install new agent and runtime

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

@@ -175,7 +175,7 @@ const upgradeCmd = new Command({
         handleError(err, `Failed to ${shouldDoMigration ? 'migrate' : 'upgrade'} codefresh runner`);
 
         console.log(colors.green(`\nSuccessfully ${shouldDoMigration ? 'migrated' : 'upgraded'} your Codefresh Runner to the latest version`));
-        console.log(colors.green(`If you had any issues with the uninstallation process please report them at: ${colors.blue('https://github.com/codefresh-io/cli/issues/new')}`));
+        console.log(colors.green(`If you had any issues with the migration process please report them at: ${colors.blue('https://github.com/codefresh-io/cli/issues/new')}`));
         await drawCodefreshFiglet();
         process.exit(); // TODO : This is not needed - needed to be fixed
     },

package.json

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