up (#237)

Author: ziv-codefresh

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

@@ -10,6 +10,7 @@ const authManager = require('../../../../logic/auth').manager; // eslint-disable
 const scriptUrl = 'https://raw.githubusercontent.com/codefresh-io/k8s-dind-config/master/codefresh-k8s-configure.sh';
 let filePath = `${homedir()}/.Codefresh/runtime/codefresh-k8s-configure.sh`;
 const dirPath = `${homedir()}/.Codefresh/runtime`;
+const codefreshPath = `${homedir()}/.Codefresh`;
 
 
 const callToScript = (k8sScript) =>{
@@ -47,22 +48,23 @@ const command = new Command({
             .option('namespace', {
                 describe: 'namespace',
             })
-            .option('local', {
-                describe: 'set if run the script from local file system',
-                type: 'boolean',
-                default: false,
-            })
             .option('context', {
                 describe: 'set your kubectl context',
-                default: '',
             })
             .example('codefresh create re [cluster] --namespace codefresh --context kubeCodefresh', 'Creating a runtime environment');
     },
     handler: async (argv) => {
         const currentContext = authManager.getCurrentContext();
-        const { local, namespace, cluster, context } = argv;
-        if (!local) {
-            if (!fs.existsSync(dirPath)) {
+        const { namespace, cluster } = argv;
+        let { context } = argv;
+        if (!context) {
+            context = '';
+        }
+        if (!process.env.LOCAL) {
+            if (!fs.existsSync(codefreshPath)) {
+                fs.mkdirSync(codefreshPath);
+                fs.mkdirSync(dirPath);
+            } else if (!fs.existsSync(dirPath)) {
                 fs.mkdirSync(dirPath);
             }
             const options = {
@@ -75,12 +77,12 @@ const command = new Command({
                     throw err;
                 }
                 fs.chmodSync(filePath, '644');
-                const k8sScript = spawn('bash', [filePath, '--api-token', currentContext.token, '--api-host', currentContext.url, '--namespace', namespace, '--context', context, cluster]);
+                const k8sScript = spawn('bash', [filePath, '--api-token', currentContext.token, '--api-host', currentContext.url, '--namespace', namespace, '--image-tag', 'master', '--remote', '--context', context, cluster]);
                 callToScript(k8sScript);
             });
         } else {
             filePath = './codefresh-k8s-configure.sh';
-            const k8sScript = spawn('bash', [filePath, '--api-token', currentContext.token, '--api-host', currentContext.url, '--namespace', namespace, '--local','--context', context, cluster]);
+            const k8sScript = spawn('bash', [filePath, '--api-token', currentContext.token, '--api-host', currentContext.url, '--namespace', namespace,'--context', context, '--image-tag', 'master', cluster]);
             callToScript(k8sScript);
         }
     },

lib/interface/cli/commands/systemRuntimeEnvironments/apply.cmd.js

@@ -14,8 +14,8 @@ const command = new Command({
     onPremCommand: true,
     usage: 'Use apply to patch an existing context',
     webDocs: {
-        category: 'Runtime-Environments (On Prem)',
-        title: 'Apply Runtime-Environments',
+        category: 'System Runtime-Environments (On Prem)',
+        title: 'Apply System Runtime-Environments',
         weight: 90,
     },
     builder: (yargs) => {

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

@@ -13,8 +13,8 @@ const command = new Command({
     description: 'Delete a runtime-environment',
     onPremCommand: true,
     webDocs: {
-        category: 'Runtime-Environments',
-        title: 'Delete Runtime-Environments',
+        category: 'System Runtime-Environments',
+        title: 'Delete System Runtime-Environments',
     },
     builder: (yargs) => {
         return yargs

lib/interface/cli/commands/systemRuntimeEnvironments/diff.cmd.js

@@ -14,8 +14,8 @@ const command = new Command({
     description: 'Show diff between two runtime environments configuration',
     onPremCommand: true,
     webDocs: {
-        category: 'Runtime-Environments (On Prem)',
-        title: 'Diff Runtime-Environments',
+        category: 'System Runtime-Environments (On Prem)',
+        title: 'Diff System Runtime-Environments',
     },
     builder: (yargs) => {
         return yargs

lib/interface/cli/commands/systemRuntimeEnvironments/get.cmd.js

@@ -17,8 +17,8 @@ const command = new Command({
     description: 'Get a runtime environments configuration',
     onPremCommand: true,
     webDocs: {
-        category: 'Runtime-Environments',
-        title: 'Get Runtime-Environments',
+        category: 'System Runtime-Environments',
+        title: 'Get System Runtime-Environments',
     },
     builder: (yargs) => {
         return yargs

lib/logic/api/cluster.js

@@ -50,6 +50,7 @@ const createCluster = async (info) => {
     const filePath = `${homedir()}/.Codefresh/cluster/stevedore`;
     const versionPath = `${homedir()}/.Codefresh/cluster/version.txt`;
     const versionUrl = 'https://raw.githubusercontent.com/codefresh-io/Stevedore/master/VERSION';
+    const codefreshPath = `${homedir()}/.Codefresh`;
     let zipPath = `${homedir()}/.Codefresh/cluster/data`;
     let shouldUpdate = true;
     const options = {
@@ -60,7 +61,10 @@ const createCluster = async (info) => {
         },
     };
     const version = await rp(options);
-    if (!fs.existsSync(dirPath)) {
+    if (!fs.existsSync(codefreshPath)) {
+        fs.mkdirSync(codefreshPath);
+        fs.mkdirSync(dirPath);
+    } else if (!fs.existsSync(dirPath)) {
         fs.mkdirSync(dirPath);
     } else if (fs.existsSync(versionPath)) {
         const currVersion = fs.readFileSync(versionPath, { encoding: 'UTF8' }).trim();

package.json

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