Cr 4249 fix2 (#662)

* fixing helm-chart-generation

Author: roi-codefresh

lib/interface/cli/commands/components/update.cmd.js

@@ -23,7 +23,7 @@ const command = new Command({
     handler: async (argv) => {
         console.log('Updating components');
         const { location, bypassDownload } = argv;
-        await helper.downloadRelatedComponents(location, bypassDownload); 
+        await helper.downloadRelatedComponents(location, bypassDownload);
     },
 });
 

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

@@ -34,6 +34,7 @@ const INSTALLATION_DEFAULTS = {
     COMPONENTS_FOLDER: 'components',
     KUBECONFIG_PATH: path.join(homedir(), '.kube', 'config'),
     SAAS_RUNTIME: 'SAAS runtime',
+    HELM_FILE_PATH: path.join(process.cwd(), 'generated_values.yaml'),
 };
 
 const RUNTIME_IMAGES = {
@@ -349,18 +350,33 @@ async function getRecommendedKubeNamespace(kubeconfigPath, kubeContextName) {
     return name;
 }
 
-async function bypassDownloadSuccess(shouldBypass, localDir, localBin) {
-    if (shouldBypass) {
-        const newLocation = path.join(process.cwd(), INSTALLATION_DEFAULTS.COMPONENTS_FOLDER, localDir, localBin);
-        if (await pathExists(newLocation)) {
-            return true;
+async function getComponent(location = CODEFRESH_PATH, component, bypassDownload) {
+    const componentName = component.name || 'component';
+    const localBinLocation = path.join(
+        process.cwd(),
+        INSTALLATION_DEFAULTS.COMPONENTS_FOLDER,
+        _.get(component, 'local.dir', ''),
+        _.get(component, 'local.bin', ''),
+    );
+
+    const downloadedBinLocation = path.join(
+        process.cwd(),
+        location,
+        _.get(component, 'local.dir', ''),
+        _.get(component, 'local.bin', ''),
+    );
+
+    if (bypassDownload) {
+        if (await pathExists(localBinLocation)) {
+            return path.join(process.cwd(), INSTALLATION_DEFAULTS.COMPONENTS_FOLDER);
+        }
+        if (await pathExists(downloadedBinLocation)) {
+            return location;
         }
+
+        throw new Error(`cannot bypass download, ${componentName} not found, aborting.`);
     }
-    return false;
-}
 
-async function attemptDownload(location, component) {
-    console.log('Downloading installer');
     const downloader = new Downloader({
         progress: new cliProgress.SingleBar(
             {
@@ -372,61 +388,30 @@ async function attemptDownload(location, component) {
         location,
     });
 
-    return await to(downloader.download(component));
-}
-
-async function downloadVeonona(location = CODEFRESH_PATH, bypassDownload = false) {
-    if (await bypassDownloadSuccess(bypassDownload, components.venona.local.dir, components.venona.local.binary)) {
-        return path.resolve(process.cwd(), INSTALLATION_DEFAULTS.COMPONENTS_FOLDER);
-    }
+    const [err] = await to(downloader.download(component));
+    if (err) {
+        if (await pathExists(localBinLocation)) {
+            console.log(`failed to download ${componentName}, using local binary instead`);
 
-    const [error] = await attemptDownload(location, components.venona);
-    if (error) {
-        if (await bypassDownloadSuccess(!bypassDownload, components.venona.local.dir, components.venona.local.binary)) {
             return path.resolve(process.cwd(), INSTALLATION_DEFAULTS.COMPONENTS_FOLDER);
         }
 
-        console.log('Failed to find component, aborting');
-        throw error;
+        throw new Error(`failed to download ${componentName}, aborting.`);
     }
 
     return location;
 }
 
-async function downloadProvider({ provider, location = CODEFRESH_PATH }, bypassDownload = false) {
-    const localSettings = components.gitops[provider].local;
-
-    if (await bypassDownloadSuccess(bypassDownload, localSettings.dir, localSettings.binary)) {
-        return path.resolve(process.cwd(), INSTALLATION_DEFAULTS.COMPONENTS_FOLDER);
-    }
-
-    const [error] = await attemptDownload(location, components.gitops[provider]);
-    if (error) {
-        if (await bypassDownloadSuccess(!bypassDownload, localSettings.dir, localSettings.binary)) {
-            return path.resolve(process.cwd(), INSTALLATION_DEFAULTS.COMPONENTS_FOLDER);
-        }
-
-        console.log('Failed to find component, aborting');
-        throw error;
-    }
-    return location;
+async function downloadVeonona(location, bypassDownload = false) {
+    return await getComponent(location, components.venona, bypassDownload);
 }
 
-async function downloadSteveDore(location = CODEFRESH_PATH, bypassDownload = false) {
-    if (await bypassDownloadSuccess(bypassDownload, components.stevedore.local.dir, components.stevedore.local.binary)) {
-        return path.resolve(process.cwd(), INSTALLATION_DEFAULTS.COMPONENTS_FOLDER);
-    }
-
-    const [error] = await attemptDownload(location, components.stevedore);
-    if (error) {
-        if (await bypassDownloadSuccess(!bypassDownload, components.stevedore.local.dir, components.stevedore.local.binary)) {
-            return path.resolve(process.cwd(), INSTALLATION_DEFAULTS.COMPONENTS_FOLDER);
-        }
+async function downloadProvider({ provider, location }, bypassDownload = false) {
+    return await await getComponent(location, components.gitops[provider], bypassDownload);
+}
 
-        console.log('Failed to find component, aborting');
-        throw error;
-    }
-    return location;
+async function downloadSteveDore(location, bypassDownload = false) {
+    return await getComponent(location, components.stevedore, bypassDownload);
 }
 
 async function downloadHybridComponents(location, bypassDownload = false) {

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

@@ -257,7 +257,6 @@ const initCmd = new Command({
         const {
             'kube-node-selector': kubeNodeSelector,
             'build-node-selector': buildNodeSelector,
-            'generate-helm-values-file': helmValuesFile,
             tolerations,
             'kube-config-path': kubeConfigPath,
             'storage-class-name': storageClassName,
@@ -287,9 +286,8 @@ const initCmd = new Command({
             'bypass-download': bypassDownload,
         } = _argv;
 
-        const shouldUseHelm = !!helmValuesFile;
-
         let {
+            'generate-helm-values-file': helmValuesFile,
             'kube-context-name': kubeContextName,
             'kube-namespace': kubeNamespace,
             'set-default-runtime': shouldMakeDefaultRe,
@@ -305,6 +303,13 @@ const initCmd = new Command({
             url = DEFAULTS.URL;
         }
 
+        if (helmValuesFile === '') {
+            // if the user specified the --generate-helm-values-file flag
+            // but did not specify file path, use a default path
+            helmValuesFile = INSTALLATION_DEFAULTS.HELM_FILE_PATH;
+        }
+        const shouldUseHelm = !!helmValuesFile;
+
         if (_.get(sdk, 'config.context.isNoAuth') && !token) {
             console.log('Not authenticated as a Codefresh account: ');
             console.log('In order to install a Codefresh Runner you need to provide ' +
@@ -944,12 +949,11 @@ const initCmd = new Command({
         await drawCodefreshFiglet();
 
         if (shouldUseHelm) {
-            console.log('\nTo install helm run:\n');
-            console.log('helm repo add cf-runtime https://h.cfcr.io/codefresh-inc/runtime');
-            console.log(`kubectl create ns ${kubeNamespace}`);
-            console.log(`helm install cf-runtime cf-runtime/cf-runtime -f ${helmValuesFile} --namespace ${kubeNamespace}\n`);
-            console.log('In order to test your runner helm based installation please execute\n' +
-                'codefresh runner execute-test-pipeline');
+            console.log(colors.blue('\nTo complete helm installation run: '));
+            console.log('    helm repo add cf-runtime https://h.cfcr.io/codefresh-inc/runtime');
+            console.log(`    helm install cf-runtime cf-runtime/cf-runtime -f ${helmValuesFile} --create-namespace --namespace ${kubeNamespace}`);
+            console.log(colors.blue('\nIn order to test your runner helm based installation please execute:\n'));
+            console.log('    codefresh runner execute-test-pipeline\n');
         }
 
         process.exit(); // TODO : This is not needed - needed to be fixed

package.json

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