SAAS-7098 (#490)

* renamed venona to runner
* moved test pipelines to runner project
* now the runtime of the test pipeline will change with every init and migration

Author: roi-codefresh

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

@@ -16,6 +16,7 @@ const INSTALLATION_DEFAULTS = {
     MAKE_DEFAULT_RE: false,
     RUN_DEMO_PIPELINE: true,
     DEMO_PIPELINE_NAME: 'Codefresh-Runner Demo',
+    PROJECT_NAME: 'Runner',
     CF_CONTEXT_NAME: 'cf-runner',
 };
 
@@ -24,10 +25,40 @@ const DefaultLogFormatter = 'plain';
 const defaultOpenIssueMessage = 'If you had any issues with this process please report them at: ' +
     `${colors.blue('https://github.com/codefresh-io/cli/issues/new')}`;
 
-async function createTestPipeline(runtimeName, pipelineName, pipelineCommands, progressReporter) {
+async function _createRunnerProjectIfNotExists() {
+    const [err, projectExists] = await to(sdk.projects.getByName({ name: INSTALLATION_DEFAULTS.PROJECT_NAME }));
+    if (_.get(err, 'message', '').includes('not found') || !projectExists) {
+        await sdk.projects.create({ projectName: INSTALLATION_DEFAULTS.PROJECT_NAME });
+        console.log(`Project "${colors.cyan(INSTALLATION_DEFAULTS.PROJECT_NAME)}" was created`);
+    } else {
+        console.log(`Project "${colors.cyan(INSTALLATION_DEFAULTS.PROJECT_NAME)}" already exists`);
+    }
+}
+
+async function getTestPipelineLink(pipelineName, pipeline) {
     const url = _.get(sdk, 'config.context.url', 'https://g.codefresh.io');
-    console.log(`Creating test pipeline with the name: "${colors.cyan(pipelineName)}"`);
-    const pipeline = await sdk.pipelines.create({ metadata: { name: pipelineName } });
+    let _pipeline = pipeline;
+    if (!_pipeline) {
+        const pipelines = await sdk.pipelines.list({ id: `${INSTALLATION_DEFAULTS.PROJECT_NAME}/${pipelineName}` });
+        if (_.get(pipelines, 'docs.length')) {
+            [_pipeline] = pipelines.docs;
+        }
+    }
+
+    if (_pipeline) {
+        const cleanPipelineName = _pipeline.metadata.name.replace(`${INSTALLATION_DEFAULTS.PROJECT_NAME}/`, ''); // remove the project prefix
+        return `${url}/pipelines/edit/workflow?id=${_pipeline.metadata.id}&pipeline=${encodeURI(cleanPipelineName)}` +
+            `&projects=${encodeURI(INSTALLATION_DEFAULTS.PROJECT_NAME)}`;
+    }
+
+    return '';
+}
+
+async function createTestPipeline(runtimeName, pipelineName, pipelineCommands, progressReporter) {
+    await _createRunnerProjectIfNotExists();
+    console.log(`Creating test pipeline with the name: "${colors.cyan(pipelineName)}" ` +
+        `in project "${colors.cyan(INSTALLATION_DEFAULTS.PROJECT_NAME)}"`);
+    const pipeline = await sdk.pipelines.create({ metadata: { name: `${INSTALLATION_DEFAULTS.PROJECT_NAME}/${pipelineName}` } });
 
     pipeline.spec.runtimeEnvironment = {
         name: runtimeName,
@@ -42,7 +73,7 @@ async function createTestPipeline(runtimeName, pipelineName, pipelineCommands, p
     };
 
     await sdk.pipelines.replace(
-        { name: pipelineName },
+        { name: `${INSTALLATION_DEFAULTS.PROJECT_NAME}/${pipelineName}` },
         {
             kind: pipeline.kind,
             spec: pipeline.spec,
@@ -55,28 +86,17 @@ async function createTestPipeline(runtimeName, pipelineName, pipelineCommands, p
         await to(progressReporter.report(PIPELINE_CREATED, STATUSES.SUCCESS));
     }
 
-    const pipelineLink = `${url}/pipelines/edit/workflow?id=${pipeline.metadata.id}&pipeline=${encodeURI(pipeline.metadata.name)}`;
+    const pipelineLink = await getTestPipelineLink(undefined, pipeline);
     console.log(`Created test pipeline with the name "${colors.cyan(pipelineName)}". Watch it here: ${colors.blue(pipelineLink)}`);
 
     return pipeline;
 }
 
-async function getTestPipelineLink(pipelineName) {
-    const url = _.get(sdk, 'config.context.url', 'https://g.codefresh.io');
-    const pipelines = await sdk.pipelines.list({ id: pipelineName });
-    if (_.get(pipelines, 'docs.length')) {
-        const pipeline = pipelines.docs[0];
-        return `${url}/pipelines/edit/workflow?id=${pipeline.metadata.id}&pipeline=${encodeURI(pipeline.metadata.name)}`;
-    }
-    return '';
-}
-
 async function getTestPipeline(pipelineName) {
-    const url = _.get(sdk, 'config.context.url', 'https://g.codefresh.io');
-    const pipelines = await sdk.pipelines.list({ id: pipelineName });
+    const pipelines = await sdk.pipelines.list({ id: `${INSTALLATION_DEFAULTS.PROJECT_NAME}/${pipelineName}` });
     if (_.get(pipelines, 'docs.length')) {
         const pipeline = pipelines.docs[0];
-        const pipelineLink = `${url}/pipelines/edit/workflow?id=${pipeline.metadata.id}&pipeline=${encodeURI(pipeline.metadata.name)}`;
+        const pipelineLink = await getTestPipelineLink(undefined, pipeline);
         console.log(`Test pipeline with the name: "${colors.cyan(pipelineName)}" already exists.` +
             ` Watch it here: ${colors.blue(pipelineLink)}`);
         return pipeline;
@@ -86,6 +106,24 @@ async function getTestPipeline(pipelineName) {
     return null;
 }
 
+async function updateTestPipelineRuntime(pipeline, runtimeName) {
+    // update pipeline runtime
+    const _pipeline = pipeline;
+    _pipeline.spec.runtimeEnvironment = {
+        name: runtimeName,
+    };
+
+    await sdk.pipelines.replace(
+        { name: _pipeline.metadata.name },
+        {
+            kind: _pipeline.kind,
+            spec: _pipeline.spec,
+            metadata: _pipeline.metadata,
+            version: _pipeline.version,
+        },
+    );
+}
+
 async function executeTestPipeline(runtimeName, pipeline, progressReporter) {
     const url = _.get(sdk, 'config.context.url', 'https://g.codefresh.io');
     const pipelineName = _.get(pipeline, 'metadata.name');
@@ -226,6 +264,7 @@ module.exports = {
     getRuntimeVersion,
     createTestPipeline,
     getTestPipeline,
+    updateTestPipelineRuntime,
     executeTestPipeline,
     createProgressBar,
     getTestPipelineLink,

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

@@ -21,6 +21,7 @@ const {
     getTestPipeline,
     createTestPipeline,
     executeTestPipeline,
+    updateTestPipelineRuntime,
     INSTALLATION_DEFAULTS,
 } = require('./helper');
 const {
@@ -44,6 +45,12 @@ async function createAndRunTestPipeline(runtimeName, errHandler, progressReporte
         ));
         await errHandler(createPipelineErr, 'Failed to create test pipeline', progressReporter, installationProgress.events.PIPELINE_CREATED);
         testPipeline = _testPipeline;
+    } else {
+        const [updatePipelineErr] = await to(updateTestPipelineRuntime(testPipeline, runtimeName));
+        if (updatePipelineErr) {
+            console.log(colors.yellow('*warning* failed to update test pipeline runtime, you can' +
+                ' change it manually if you want to run it again on this runtime'));
+        }
     }
     console.log(`${colors.yellow('*NOTE* Running a pipeline for the first time might take longer than usual.')}`);
     const [runPipelineErr] = await to(executeTestPipeline(

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

@@ -9,6 +9,7 @@ const inquirer = require('inquirer');
 const fs = require('fs');
 const {
     getTestPipeline,
+    updateTestPipelineRuntime,
     createTestPipeline,
     executeTestPipeline,
     createProgressBar,
@@ -31,6 +32,12 @@ async function createAndRunTestPipeline(runtimeName, errHandler) {
         ));
         await errHandler(createPipelineErr, 'Failed to create test pipeline');
         testPipeline = _testPipeline;
+    } else {
+        const [updatePipelineErr] = await to(updateTestPipelineRuntime(testPipeline, runtimeName));
+        if (updatePipelineErr) {
+            console.log(colors.yellow('*warning* failed to update test pipeline runtime, you can' +
+                ' change it manually if you want to run it again on this runtime'));
+        }
     }
     const [runPipelineErr] = await to(executeTestPipeline(
         runtimeName,
@@ -133,6 +140,7 @@ async function migrate({
         'runtime-name': runtimeName,
         'runtime-kube-context-name': kubeContextName,
         'runtime-kube-namespace': kubeNamespace,
+        'runtime-kube-serviceaccount': 'venona',
         'runtime-kube-config-path': kubeConfigPath,
         'agent-kube-context-name': kubeContextName,
         'agent-kube-namespace': kubeNamespace,

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

@@ -79,6 +79,7 @@ const attachRuntimeCmd = new Command({
             'runtime-kube-config-path': kubeConfigPath,
             'agent-kube-namespace': agentKubeNamespace,
             'agent-kube-config-path': agentKubeConfigPath,
+            'runtime-kube-serviceaccount': kubeServiceAccount,
             'restart-agent': restartAgent,
             verbose,
 
@@ -132,6 +133,7 @@ const attachRuntimeCmd = new Command({
         });
         await sdk.runtime.attach({
             kubeContextName,
+            kubeServiceAccount,
             kubeNamespace,
             kubeConfigPath,
             agentKubeContextName,

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

@@ -12,6 +12,7 @@ const _ = require('lodash');
 const { DefaultLogFormatter } = require('./../hybrid/helper');
 
 const defaultNamespace = 'codefresh';
+const defaultStorageClassPrefix = 'dind-local-volumes-runner';
 const maxRuntimeNameLength = 63;
 
 async function newRuntimeName(kubeContextName, kubeNamespace) {
@@ -176,7 +177,7 @@ const installRuntimeCmd = new Command({
         // create RE in codefresh
         await sdk.cluster.create({
             namespace: kubeNamespace,
-            storageClassName,
+            storageClassName: storageClassName || `${defaultStorageClassPrefix}-${kubeNamespace}`,
             runnerType: kubernetesRunnerType,
             nodeSelector: kubeNodeSelectorObj,
             annotations: buildAnnotations,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.68.0",
+  "version": "0.68.1",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,
@@ -37,7 +37,7 @@
     "cf-errors": "^0.1.12",
     "chalk": "^1.1.3",
     "cli-progress": "3.6.0",
-    "codefresh-sdk": "^1.9.10",
+    "codefresh-sdk": "^1.9.11",
     "colors": "^1.1.2",
     "columnify": "^1.5.4",
     "compare-versions": "^3.4.0",

yarn.lock

@@ -1242,10 +1242,10 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codefresh-sdk@^1.9.10:
-  version "1.9.10"
-  resolved "https://registry.yarnpkg.com/codefresh-sdk/-/codefresh-sdk-1.9.10.tgz#47643648e513aa998d2a5556e957b3cf6ad7706e"
-  integrity sha512-Xr+numOuRzBqigOBqVBR3W/BJKvOqU7n+i7H90n567tUHn/x0oz6VVIp99JIA65w9UiihAZqEO3xRBowodbw3A==
+codefresh-sdk@^1.9.11:
+  version "1.9.11"
+  resolved "https://registry.yarnpkg.com/codefresh-sdk/-/codefresh-sdk-1.9.11.tgz#2f9f801cc280d2c394a898a1bc61ffd04ccf29f5"
+  integrity sha512-L7ysKRRwdvQ44JIBd016N8Vzff2Q6FXTucGr57XB3o2Jvbf9HhXCwS4VfE3jETKDGALB3/IqwcCwVuC/+O5/Tg==
   dependencies:
     bluebird "^3.5.3"
     cf-errors "^0.1.12"