calculate default value to kube-context (#421)

Author: oren-codefresh

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

@@ -4,7 +4,7 @@ const Command = require('../../Command');
 const { sdk } = require('../../../../logic');
 const ProgressEvents = require('../../helpers/progressEvents');
 const cliProgress = require('cli-progress');
-
+const { getKubeContext } = require('../../helpers/kubernetes');
 
 const attachAgentToRuntime = async (agent, name) => {
     const rt = await sdk.runtimeEnvs.get({ name });
@@ -72,16 +72,18 @@ const attachRuntimeCmd = new Command({
             'agent-name': agentName,
             'runtime-name': runtimeName,
             'agent-id': agentId,
-            'runtime-kube-context-name': kubeContextName,
             'runtime-kube-namespace': kubeNamespace,
             'runtime-kube-config-path': kubeConfigPath,
-            'agent-kube-context-name': agentKubeContextName,
             'agent-kube-namespace': agentKubeNamespace,
             'agent-kube-config-path': agentKubeConfigPath,
             'restart-agent': restartAgent,
             verbose,
 
         } = argv;
+        let {
+            'runtime-kube-context-name': kubeContextName,
+            'agent-kube-context-name': agentKubeContextName,
+        } = argv;
         const { terminateProcess } = argv;
         let agent;
         if (_.isNull(runtimeName) || _.isUndefined(runtimeName) || runtimeName === '') {
@@ -100,6 +102,12 @@ const attachRuntimeCmd = new Command({
         if (!kubeNamespace) {
             throw new Error('runtime-kube-namespace is mandatory parameter');
         }
+        if (!kubeContextName) {
+            kubeContextName = getKubeContext(kubeConfigPath);
+        }
+        if (!agentKubeContextName) {
+            agentKubeContextName = kubeContextName;
+        }
 
         await attachAgentToRuntime(agent, runtimeName);
 

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

@@ -99,7 +99,6 @@ const installRuntimeCmd = new Command({
         const {
             'storage-class-name': storageClassName,
             'agent-name': agentName,
-            'runtime-kube-context-name': kubeContextName,
             'dry-run': dryRun,
             'runtime-kube-namespace': kubeNamespace,
             'in-cluster': inCluster,
@@ -112,6 +111,7 @@ const installRuntimeCmd = new Command({
         } = argv;
 
         let {
+            'runtime-kube-context-name': kubeContextName,
             'agent-kube-context-name': agentKubeContextName,
             'agent-kube-namespace': agentKubeNamespace,
             'agent-kube-config-path': agentKubeConfigPath,
@@ -123,6 +123,9 @@ const installRuntimeCmd = new Command({
         }
 
         const apiHost = sdk.config.context.url;
+        if (!kubeContextName) {
+            kubeContextName = getKubeContext(kubeConfigPath);
+        }
         const clusterName = kubeContextName || getKubeContext(kubeConfigPath);
         const runtimeName = `${clusterName}/${kubeNamespace}`;
 

package.json

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