Saas 7228 - improved runner delete command (#471)

Author: roi-codefresh

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

@@ -2,7 +2,7 @@
 const Command = require('../../Command');
 const runnerRoot = require('../root/runner.cmd');
 const inquirer = require('inquirer');
-const { getAllKubeContexts, getKubeContext } = require('../../helpers/kubernetes');
+const { getAllKubeContexts, getKubeContext, getAllNamespaces } = require('../../helpers/kubernetes');
 const unInstallRuntime = require('../runtimeEnvironments/uninstall.cmd');
 const unInstallAgent = require('../agent/uninstall.cmd');
 const unInstallMonitor = require('../monitor/uninstall.cmd');
@@ -25,6 +25,41 @@ async function handleError(error, message) {
     process.exit(1);
 }
 
+// Try to get the most relevant namespaces
+async function getRelatedNamespaces(kubeConfigPath, kubeContextName, runtimes) {
+    const [, namespacesOnCluster] = await to(getAllNamespaces(kubeConfigPath, kubeContextName));
+    const nsOnCluster = new Set(namespacesOnCluster || []);
+
+    return _(runtimes)
+        .filter(re => nsOnCluster.has(_.get(re, 'runtimeScheduler.cluster.namespace')))
+        .map(re => _.get(re, 'runtimeScheduler.cluster.namespace'))
+        .uniq()
+        .value();
+}
+
+async function getRelatedAgents(kubeNamespace, runtimes) {
+    const [listAgentsErr, agents] = await to(sdk.agents.list({}));
+    await handleError(listAgentsErr, 'Failed to get agents');
+
+    const relatedREs = new Set();
+    _.forEach(runtimes, (r) => {
+        if (_.get(r, 'runtimeScheduler.cluster.namespace') === kubeNamespace) {
+            relatedREs.add(r.metadata.name);
+        }
+    });
+
+    const relatedAgents = [];
+    _.forEach(agents, (a) => {
+        _.forEach(_.get(a, 'runtimes', []), (r) => {
+            if (relatedREs.has(r)) {
+                relatedAgents.push(a);
+            }
+        });
+    });
+
+    return relatedAgents;
+}
+
 const deleteCmd = new Command({
     root: false,
     parent: runnerRoot,
@@ -68,50 +103,73 @@ const deleteCmd = new Command({
             name: agentName,
         } = argv;
 
-        const questions = [];
+        const [listReErr, runtimes] = await to(sdk.runtimeEnvs.list({ }));
+        await handleError(listReErr, 'Failed to get runtime environments');
+
+        console.log(colors.green('This uninstaller will guide you through the runner uninstallation process'));
+
         if (!kubeContextName) {
             const contexts = getAllKubeContexts(kubeConfigPath);
             const currentKubeContext = getKubeContext(kubeConfigPath);
 
-            questions.push({
+            const answer = await inquirer.prompt({
                 type: 'list',
                 name: 'context',
                 message: 'Name of Kubernetes context to use',
                 default: currentKubeContext,
                 choices: contexts,
             });
+
+            kubeContextName = answer.context;
         }
+
         if (!kubeNamespace) {
-            questions.push({
-                type: 'input',
-                name: 'namespace',
-                default: defaultNamespace,
-                message: 'Kubernetes namespace to remove Codefresh Runner components from ',
-                validate: value => (value !== undefined && value !== '') || 'Please enter namespace\'s name',
-            });
+            const relatedNamespaces = await getRelatedNamespaces(kubeConfigPath, kubeContextName, runtimes);
+            let answer;
+            if (!relatedNamespaces.length) {
+                answer = await inquirer.prompt({
+                    type: 'input',
+                    name: 'namespace',
+                    default: defaultNamespace,
+                    message: 'Kubernetes namespace to remove Codefresh Runner components from',
+                    validate: value => (value !== undefined && value !== '') || 'Please enter namespace\'s name',
+                });
+            } else {
+                answer = await inquirer.prompt({
+                    type: 'list',
+                    name: 'namespace',
+                    default: defaultNamespace,
+                    message: 'Kubernetes namespace to remove Codefresh Runner components from ',
+                    choices: relatedNamespaces,
+                });
+            }
+
+            kubeNamespace = answer.namespace;
         }
-        const [listAgentsErr, agents] = await to(sdk.agents.list({}));
-        await handleError(listAgentsErr, 'Failed to get agents');
+
+        const agents = await getRelatedAgents(kubeNamespace, runtimes);
+        if (!agents.length) {
+            console.log('No agents related to the specified kubernetes cluster and namespace were found');
+            process.exit(1);
+        }
+
         if (!agentName) {
-            questions.push({
+            const answer = await inquirer.prompt({
                 type: 'list',
                 name: 'name',
                 message: 'Agent name to uninstall',
                 choices: agents,
             });
+            agentName = answer.name;
         }
-        console.log(colors.green('This uninstaller will guide you through the runner uninstallation process'));
-        const answers = await inquirer.prompt(questions);
-        kubeContextName = kubeContextName || answers.context;
-        kubeNamespace = kubeNamespace || answers.namespace;
-        agentName = agentName || answers.name;
+
         // check that agent exists
         const agent = _.find(agents, curr => curr.name === agentName);
         if (!agent) {
             console.log(colors.red(`Agent with name ${agentName} doesn't exists`));
             return;
         }
-        if (agent.runtimes && agent.runtimes > 1) {
+        if (agent.runtimes && agent.runtimes.length > 1) {
             console.log('Can\'t delete runner with more than one runtime, use runtime delete command');
             return;
         }

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

@@ -328,7 +328,6 @@ const initCmd = new Command({
         };
         const [runnerErr, runtimeName] = await to(installAgent.handler(agentInstallOptions));
         await handleError(runnerErr, 'Runner installation failed', progressReporter, installationProgress.events.RUNNER_INSTALLED);
-
         await to(progressReporter.report(installationProgress.events.RUNNER_INSTALLED, installationProgress.status.SUCCESS));
 
         // Install monitoring
@@ -343,7 +342,6 @@ const initCmd = new Command({
         };
         const [monitorErr] = await to(installMonitoring.handler(monitorInstallOptions));
         await handleError(monitorErr, 'Monitor installation failed', progressReporter, installationProgress.events.MONITOR_INSTALLED);
-
         await to(progressReporter.report(installationProgress.events.MONITOR_INSTALLED, installationProgress.status.SUCCESS));
 
         // Post Installation

lib/interface/cli/helpers/kubernetes.js

@@ -35,11 +35,11 @@ const getAllNamespaces = async (kubeconfigPath, kubeContextName) => {
     const backend = new Request({ kubeconfig });
     const client = new Client({ backend, version: 1.13 });
     const resp = await client.api.v1.namespaces.get();
-    if (resp.statusCode === 200) {
-        const nsObjs = _.get(resp, 'body.items');
-        return _.map(nsObjs, ns => _.get(ns, 'metadata.name'));
+    if (resp.statusCode !== 200) {
+        throw new Error(`could not get namespaces from cluster ${kubeContextName}, failed with status: ${resp.statusCode}`);
     }
-    return [];
+    const nsObjs = _.get(resp, 'body.items');
+    return _.map(nsObjs, ns => _.get(ns, 'metadata.name'));
 };
 
 module.exports = {

package.json

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