make agent-kube-namespace as mandatory (#474)

Author: oren-codefresh

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

@@ -90,6 +90,12 @@ const installAgentCmd = new Command({
         .option('skip-cluster-test', {
             describe: 'Do not run cluster acceptance test',
         })
+        .option('agent-kube-context-name', {
+            describe: 'Agent kubernetes context (on attach)',
+        })
+        .option('agent-kube-namespace', {
+            describe: 'Agent\'s namespace (on attach)',
+        })
         .option('verbose', {
             describe: 'Print logs',
         }),
@@ -114,6 +120,8 @@ const installAgentCmd = new Command({
             terminateProcess,
             'set-value': setValue,
             'set-file': setFile,
+            'agent-kube-context-name': agentKubeContextName,
+            'agent-kube-namespace': agentKubeNamespace,
         } = argv;
         let agent;
         let {
@@ -126,6 +134,9 @@ const installAgentCmd = new Command({
         if (!kubeNamespace) {
             kubeNamespace = defaultNamespace;
         }
+        if (installRuntime && !agentKubeNamespace) {
+            throw new Error('agent-kube-namespace is a mandatory parameter when installing runtime');
+        }
 
         if (!token) { // Create an agent if not provided
             name = name || await newAgentName(kubeContextName, kubeNamespace);
@@ -202,6 +213,8 @@ const installAgentCmd = new Command({
                 'storage-class-name': storageClassName,
                 'set-value': setValue,
                 'set-file': setFile,
+                'agent-kube-namespace': agentKubeNamespace,
+                'agent-kube-context-name': agentKubeContextName,
                 verbose,
                 terminateProcess,
             });

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

@@ -338,6 +338,8 @@ const initCmd = new Command({
             terminateProcess: false,
             'set-value': setValue,
             'set-file': setFile,
+            'agent-kube-context-name': kubeContextName,
+            'agent-kube-namespace': kubeNamespace,
         };
         const [runnerErr, runtimeName] = await to(installAgent.handler(agentInstallOptions));
         await handleError(runnerErr, 'Runner installation failed', progressReporter, installationProgress.events.RUNNER_INSTALLED);

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

@@ -26,7 +26,7 @@ async function newRuntimeName(kubeContextName, kubeNamespace) {
         let suggestName;
         // eslint-disable-next-line no-constant-condition
         while (true) {
-            suggestName = `${defaultName.slice(0, maxRuntimeNameLength - 2)}_${i}`;
+            suggestName = `${defaultName.slice(0, maxRuntimeNameLength - 1 - i.toString().length)}_${i}`;
             if (!reNames.has(suggestName)) {
                 break;
             }
@@ -91,9 +91,6 @@ const installRuntimeCmd = new Command({
         .option('attach-runtime', {
             describe: 'if set to true, auto attach runtime to agent (need to provide ....)',
         })
-        .option('agent-kube-namespace', {
-            describe: 'Agent\'s namespace',
-        })
         .option('agent-kube-config-path', {
             describe: 'Path to kubeconfig file for the agent (default is $HOME/.kube/config)',
         })
@@ -150,6 +147,9 @@ const installRuntimeCmd = new Command({
         if (!kubeNamespace) {
             kubeNamespace = defaultNamespace;
         }
+        if (attachRuntime && !agentKubeNamespace) {
+            throw new Error('agent-kube-namespace is a mandatory parameter');
+        }
 
         // parse kubeNodeSelector in form key1=value1,key2=value2 to {key1: value1, key2: value2}
         const kubeNodeSelectorObj = {};

package.json

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