Saas 8012 - patching runtime-images and added insecure flag to attach-runtime (#531)

Author: roi-codefresh

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

@@ -30,6 +30,21 @@ const INSTALLATION_DEFAULTS = {
     COMPONENTS_FOLDER: 'components',
 };
 
+const RUNTIME_IMAGES = {
+    DOCKER_PUSHER_IMAGE: 'codefresh/cf-docker-pusher:v5',
+    DOCKER_PULLER_IMAGE: 'codefresh/cf-docker-puller:v7',
+    DOCKER_TAG_PUSHER_IMAGE: 'codefresh/cf-docker-tag-pusher:v2',
+    DOCKER_BUILDER_IMAGE: 'codefresh/cf-docker-builder:v16',
+    GC_BUILDER_IMAGE: 'codefresh/cf-gc-builder:0.4.0',
+    CONTAINER_LOGGER_IMAGE: 'codefresh/cf-container-logger:1.4.2',
+    GIT_CLONE_IMAGE: 'codefresh/cf-git-cloner:10.0.1',
+    COMPOSE_IMAGE: 'docker/compose:1.11.2',
+    KUBE_DEPLOY: 'codefresh/cf-deploy-kubernetes:latest',
+    FS_OPS_IMAGE: 'codefresh/fs-ops:latest',
+    TEMPLATE_ENGINE: 'codefresh/pikolo:latest',
+    PIPELINE_DEBUGGER_IMAGE: 'codefresh/cf-debugger:1.1.2',
+};
+
 const maxRuntimeNameLength = 63;
 const DefaultLogFormatter = 'plain';
 
@@ -549,6 +564,9 @@ async function installRuntime({
     if (storageClassName) {
         cmd.push(`--storage-class=${storageClassName}`);
     }
+    if (process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
+        cmd.push('--insecure');
+    }
 
     await componentRunner.run(components.venona, cmd);
 }
@@ -690,6 +708,13 @@ function detectProxy() {
     };
 }
 
+function getRuntimeImagesWithRegistryUrl(registry) {
+    return Object.keys(RUNTIME_IMAGES).reduce((acc, cur) => {
+        acc[cur] = `${registry}/${RUNTIME_IMAGES[cur]}`;
+        return acc;
+    }, {});
+}
+
 module.exports = {
     getRelatedAgents,
     createErrorHandler,
@@ -718,6 +743,7 @@ module.exports = {
     runUpgrade,
     detectProxy,
     serealizeToKeyValuePairs,
+    getRuntimeImagesWithRegistryUrl,
     INSTALLATION_DEFAULTS,
     DefaultLogFormatter,
 };

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

@@ -31,6 +31,7 @@ const {
     detectProxy,
     keyValueAsStringToObject,
     serealizeToKeyValuePairs,
+    getRuntimeImagesWithRegistryUrl,
     INSTALLATION_DEFAULTS,
 } = require('./helper');
 const InstallationPlan = require('./InstallationPlan');
@@ -444,6 +445,21 @@ const initCmd = new Command({
             },
         });
 
+        // update runtime images with docker-registry
+        installationPlan.addStep({
+            name: 'update runtime environment images with docker-registry url',
+            func: async () => {
+                const reName = installationPlan.getContext('runtimeName');
+                const re = await sdk.runtimeEnvs.get({ name: reName });
+                const body = _.set({}, 'runtimeScheduler.envVars', getRuntimeImagesWithRegistryUrl(dockerRegistry));
+                _.set(body, 'runtimeScheduler.image', `${dockerRegistry}/codefresh/engine:master`);
+                _.set(body, 'dockerDaemonScheduler.dindImage', `${dockerRegistry}/codefresh/dind:18.09.5-v24-sp`);
+                await sdk.runtimeEnvs.update({ name: reName }, _.merge(re, body));
+                console.log(`Runtime environment "${colors.cyan(reName)}" has been updated with the specified docker-registry images`);
+            },
+            condition: !!dockerRegistry,
+        });
+
         // set runtime as default
         installationPlan.addStep({
             name: 'set new runtime as default',

package.json

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