Saas 7914 - add docker-registry option to runner init (#530)

Author: roi-codefresh

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

@@ -72,6 +72,10 @@ const installAgentCmd = new Command({
         .option('agent-kube-namespace', {
             describe: 'Agent\'s namespace (on attach)',
         })
+        .option('docker-registry', {
+            describe: 'The prefix for the container registry that will be used for pulling the required components images. Example: --docker-registry="docker.io"',
+            type: 'string',
+        })
         .option('verbose', {
             describe: 'Print logs',
         }),
@@ -99,6 +103,7 @@ const installAgentCmd = new Command({
             'set-file': setFile,
             'agent-kube-context-name': agentKubeContextName,
             'agent-kube-namespace': agentKubeNamespace,
+            'docker-registry': dockerRegistry,
             envVars,
         } = argv;
         let agent;
@@ -163,6 +168,7 @@ const installAgentCmd = new Command({
             dryRun,
             inCluster,
             kubeNodeSelector,
+            dockerRegistry,
             kubernetesRunnerType,
             tolerations,
             kubeConfigPath,

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

@@ -405,6 +405,7 @@ async function installAgent({
     agentId, // --agnetId
     kubeContextName, // kube-context-name
     kubeNamespace, // --kube-namespace
+    dockerRegistry, // --docker-registry
     token, // --agentToken
     kubeNodeSelector, // --kube-node-selector
     dryRun, // --dryRun
@@ -439,6 +440,10 @@ async function installAgent({
         cmd.push(kubeNodeSelector);
     }
 
+    if (dockerRegistry) {
+        cmd.push(`--docker-registry=${dockerRegistry}`);
+    }
+
     if (token) {
         cmd.push(`--agentToken=${token}`);
     }
@@ -478,6 +483,7 @@ async function installRuntime({
     token, // --agent-token
     kubeContextName, // kube-context-name
     kubeNamespace, // --kube-namespace
+    dockerRegistry, // --docker-registry
     dryRun, // --dryRun
     inCluster, // -inCluster
     kubernetesRunnerType, // --kubernetes-runner-type
@@ -507,6 +513,10 @@ async function installRuntime({
         logFormatting,
     ];
 
+    if (dockerRegistry) {
+        cmd.push(`--docker-registry=${dockerRegistry}`);
+    }
+
     if (dryRun) {
         cmd.push('--dry-run');
     }

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

@@ -125,6 +125,10 @@ const initCmd = new Command({
         .option('storage-class-name', {
             describe: 'Set a name of your custom storage class',
         })
+        .option('docker-registry', {
+            describe: 'The prefix for the container registry that will be used for pulling the required components images. Example: --docker-registry="docker.io"',
+            type: 'string',
+        })
         .option('kube-config-path', {
             describe: 'Path to kubeconfig file (default is $HOME/.kube/config)',
         })
@@ -183,6 +187,7 @@ const initCmd = new Command({
             'set-file': setFile,
             'skip-cluster-test': skipClusterTest,
             'install-monitor': installMonitor,
+            'docker-registry': dockerRegistry,
         } = _argv;
         let {
             'kube-context-name': kubeContextName,
@@ -397,6 +402,7 @@ const initCmd = new Command({
                     kubeNodeSelector,
                     tolerations,
                     kubeConfigPath,
+                    dockerRegistry,
                     verbose,
                     agentId: installationPlan.getContext('agentName'),
                     envVars: serealizeToKeyValuePairs(envVars),
@@ -487,6 +493,7 @@ const initCmd = new Command({
                     kubeConfigPath,
                     verbose,
                     kubeNodeSelector,
+                    dockerRegistry,
                     setValue,
                     setFile,
                     storageClassName,
@@ -548,6 +555,7 @@ const initCmd = new Command({
                 'cluster-id': kubeContextName,
                 'kube-context-name': kubeContextName,
                 'kube-namespace': kubeNamespace,
+                'docker-registry': dockerRegistry,
                 token: _.get(sdk, 'config.context.token'),
                 verbose,
                 noExit: true, // to prevent if from calling inner: process.exit()

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

@@ -89,10 +89,21 @@ const upgradeCmd = new Command({
 
         const [listAgentsErr, agents] = await to(sdk.agents.list({ }));
         await handleError(listAgentsErr, 'Failed to get agents');
+        const agentsByName = agents.reduce((acc, cur) => ({ ...acc, [cur.name]: cur }), {});
 
         console.log(colors.green('This upgrader will guide you through the runner upgrade process'));
 
         let runtimeVersion;
+
+        if (agentName && agentsByName[agentName]) {
+            const agent = agentsByName[agentName];
+            const attachedRuntimes = agent.runtimes || [];
+            if (attachedRuntimes.length === 1) {
+                [runtimeName] = attachedRuntimes;
+                console.log(`Chose to upgrade runner: "${colors.cyan(agentName)}" and runtime: "${colors.cyan(runtimeName)}"`);
+            }
+        }
+
         if (!runtimeName) {
             const runtimesWithVersions = getRuntimesWithVersions(runtimes, agents);
             if (!_.size(runtimesWithVersions)) {

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

@@ -33,6 +33,10 @@ const installMonitorCmd = new Command({
         .option('kube-namespace', {
             describe: 'Name of the namespace on which monitor should be installed [$CF_ARG_KUBE_NAMESPACE]',
         })
+        .option('docker-registry', {
+            describe: 'The prefix for the container registry that will be used for pulling the required components images. Example: --docker-registry="docker.io"',
+            type: 'string',
+        })
         .option('verbose', {
             describe: 'Print logs',
         }),
@@ -44,6 +48,7 @@ const installMonitorCmd = new Command({
             token,
             'kube-context-name': kubeContextName,
             'kube-namespace': kubeNamespace,
+            'docker-registry': dockerRegistry,
             verbose,
             //        noExit,
         } = argv;
@@ -90,6 +95,10 @@ const installMonitorCmd = new Command({
             commands.push(`--log-formtter=${DefaultLogFormatter}`);
         }
 
+        if (dockerRegistry) {
+            commands.push(`--docker-registry=${dockerRegistry}`);
+        }
+
         await componentRunner.run(components.venona, commands);
     },
 });

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

@@ -66,6 +66,10 @@ const installRuntimeCmd = new Command({
         .option('kube-node-selector', {
             describe: 'The kubernetes node selector "key=value" to be used by runner build resources (default is no node selector) (string)',
         })
+        .option('docker-registry', {
+            describe: 'The prefix for the container registry that will be used for pulling the required components images. Example: --docker-registry="docker.io"',
+            type: 'string',
+        })
         .option('set-value', {
             describe: 'Set values for templates, example: --set-value LocalVolumesDir=/mnt/disks/ssd0/codefresh-volumes',
         })
@@ -132,6 +136,7 @@ const installRuntimeCmd = new Command({
             'attach-runtime': attachRuntime,
             'cluster-service-account': clusterServiceAccount,
             'make-default-runtime': shouldMakeDefaultRe,
+            'docker-registry': dockerRegistry,
             terminateProcess,
         } = argv;
 
@@ -252,6 +257,7 @@ const installRuntimeCmd = new Command({
             inCluster,
             kubernetesRunnerType,
             kubeConfigPath,
+            dockerRegistry,
             verbose,
             kubeNodeSelector,
             setValue,

package.json

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