CR-1351 Add kube-manifestpath in gitops instalation (#582)

* CR-1351 Add kube-manifestpath in gitops instalation

* support proxy params

Co-authored-by: 123 <git config --global user.name [email protected]>
Co-authored-by: pashavictorovich <[email protected]>

Author: 3 people

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

@@ -2,7 +2,7 @@
 const _ = require('lodash');
 const Command = require('../../Command');
 const installRoot = require('../root/install.cmd');
-const { downloadProvider } = require('../hybrid/helper');
+const { downloadProvider, detectProxy } = require('../hybrid/helper');
 const { Runner, components } = require('../../../../binary');
 
 const installArgoCmd = new Command({
@@ -52,16 +52,32 @@ const installArgoCmd = new Command({
         .option('kube-namespace', {
             describe: 'Namespace in Kubernetes cluster',
         })
+        .option('kube-manifest-path', {
+            describe: 'Path to k8s manifest yaml file',
+        })
         .option('sync-mode', {
             choices: ['NONE', 'SELECT', 'CONTINUE_SYNC', 'ONE_TIME_SYNC'],
             describe: 'Synchronization mode\nNONE - don\'t synchronize\nSELECT - select applications for synchronization\nCONTINUE_SYNC - continuous synchronization\nONE_TIME_SYNC - synchronize one time',
         })
         .option('sync-apps', {
             array: true,
             describe: 'Applications to be synchronized',
+        })
+        .option('http-proxy', {
+            describe: 'http proxy to be used in the runner',
+        })
+        .option('https-proxy', {
+            describe: 'https proxy to be used in the runner',
         }),
     handler: async (argv) => {
-        const { 'kube-config-path': kubeConfigPath, provider } = argv;
+        let {
+            // eslint-disable-next-line prefer-const
+            'kube-config-path': kubeConfigPath,
+            // eslint-disable-next-line prefer-const
+            provider,
+            'http-proxy': httpProxy,
+            'https-proxy': httpsProxy,
+        } = argv;
 
         const binLocation = await downloadProvider({ provider });
         const componentRunner = new Runner(binLocation);
@@ -75,7 +91,7 @@ const installArgoCmd = new Command({
             commands.push(kubeConfigPath);
         }
 
-        const installOptions = _.pick(argv, ['git-integration', 'codefresh-integration', 'argo-host', 'argo-token',
+        const installOptions = _.pick(argv, ['git-integration', 'codefresh-integration', 'argo-host', 'argo-token', 'kube-manifest-path',
             'argo-username', 'argo-password', 'update', 'kube-context-name', 'kube-namespace', 'sync-mode', 'sync-apps']);
 
         _.forEach(installOptions, (value, key) => {
@@ -90,6 +106,21 @@ const installArgoCmd = new Command({
             }
         });
 
+        const detectedProxyVars = detectProxy();
+        httpProxy = httpProxy || detectedProxyVars.httpProxy;
+        httpsProxy = httpsProxy || detectedProxyVars.httpsProxy;
+
+        if (httpProxy) {
+            commands.push('--http-proxy');
+            commands.push(httpProxy);
+        }
+
+        if (httpsProxy) {
+            commands.push('--https-proxy');
+            commands.push(httpsProxy);
+        }
+
+
         await componentRunner.run(components.gitops[provider], commands);
     },
 });

package.json

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