added support to install app-proxy ingress (#566)

Author: roi-codefresh

lib/binary/runner.js

@@ -28,7 +28,7 @@ class Runner {
 
     runAndAttach(component, args) {
         const dir = join(this.location, component.local.dir);
-        const path = join(dir, component.local.binary);
+        const path = component.local.alternateBinary || join(dir, component.local.binary);
         const cp = spawn(path, args, {
             stdio: [process.stdin, process.stdout, process.stderr, 'pipe'],
         });

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

@@ -626,6 +626,8 @@ async function installAppProxy({
     verbose, // --verbose
     logFormatting = DefaultLogFormatter, // --log-formtter
     valuesFile, // --values
+    appProxyHost, // --app-proxy-host
+    appProxyIngressClass, // --app-proxy-ingress-class
 }) {
     const binLocation = await downloadVeonona();
     const componentRunner = new Runner(binLocation);
@@ -652,6 +654,13 @@ async function installAppProxy({
     if (valuesFile) {
         cmd.push(`--values=${valuesFile}`);
     }
+    if (appProxyHost) {
+        cmd.push(`--host=${appProxyHost}`);
+    }
+    if (appProxyIngressClass) {
+        cmd.push(`--ingress-class=${appProxyIngressClass}`);
+    }
+
     const cp = componentRunner.runAndAttach(components.venona, cmd, true);
     const chunks = [];
     let ingressIp;

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

@@ -57,15 +57,22 @@ function printInstallationOptionsSummary({
     shouldExecutePipeline,
     httpProxy,
     httpsProxy,
+    appProxy,
+    appProxyHost,
 }) {
-    console.log(`\n${colors.green('Installation options summary:')} 
+    let summary = `\n${colors.green('Installation options summary:')} 
     1. Kubernetes Context: ${colors.cyan(kubeContextName)}
     2. Kubernetes Namespace: ${colors.cyan(kubeNamespace)}
     3. Set this as default account runtime-environment: ${colors.cyan(!!shouldMakeDefaultRe)}
     4. Execute demo pipeline after install: ${colors.cyan(!!shouldExecutePipeline)}
     5. HTTP proxy: ${httpProxy ? colors.cyan(httpProxy) : 'none'}
     6. HTTPS proxy: ${httpsProxy ? colors.cyan(httpsProxy) : 'none'} 
-    `);
+    `;
+
+    if (appProxy) {
+        summary += `7. App-Proxy hostname: ${colors.cyan(appProxyHost)}\n`;
+    }
+    console.log(summary);
 }
 
 const initCmd = new Command({
@@ -164,6 +171,14 @@ const initCmd = new Command({
             describe: 'install app proxy component (default false)',
             default: false,
             type: 'boolean',
+        })
+        .option('app-proxy-host', {
+            describe: 'the hostname that will be used by the app-proxy ingress',
+            type: 'string',
+        })
+        .option('app-proxy-ingress-class', {
+            describe: 'the ingress class that will be used by the app-proxy ingress',
+            type: 'string',
         }),
     handler: async (argv) => {
         let resumedInstallation = false;
@@ -199,7 +214,7 @@ const initCmd = new Command({
             'set-file': setFile,
             'skip-cluster-test': skipClusterTest,
             'docker-registry': dockerRegistry,
-            'app-proxy': appProxy,
+            'app-proxy-ingress-class': appProxyIngressClass,
         } = _argv;
         let {
             yes: noQuestions,
@@ -213,6 +228,8 @@ const initCmd = new Command({
             url,
             token,
             name,
+            'app-proxy': appProxy,
+            'app-proxy-host': appProxyHost,
             'install-monitor': installMonitor,
         } = _argv;
 
@@ -240,6 +257,15 @@ const initCmd = new Command({
             if (typeof _.get(valuesObj, 'Monitor.Enabled') !== 'undefined') {
                 installMonitor = _.get(valuesObj, 'Monitor.Enabled');
             }
+            if (_.get(valuesObj, 'AppProxy')) {
+                appProxy = true;
+            }
+            if (!appProxyHost && _.get(valuesObj, 'AppProxy.Host')) {
+                appProxyHost = _.get(valuesObj, 'AppProxy.Host');
+            }
+            if (appProxy && !appProxyHost) {
+                handleError(new Error('no hostname provided'), 'cannot install app-proxy component without a hostname', undefined, undefined, true);
+            }
         }
         if (!url) {
             url = DEFAULTS.URL;
@@ -296,7 +322,7 @@ const initCmd = new Command({
                     type: 'input',
                     name: 'httpProxy',
                     default: httpProxy,
-                    message: 'HTTP proxy to be used by runner inside Kubernetes ?',
+                    message: 'HTTP proxy to be used by runner inside Kubernetes?',
                 });
             }
 
@@ -305,8 +331,17 @@ const initCmd = new Command({
                     type: 'input',
                     name: 'httpsProxy',
                     default: httpsProxy,
-                    message: 'HTTPS proxy to be used by runner inside Kubernetes ?',
+                    message: 'HTTPS proxy to be used by runner inside Kubernetes?',
+
+                });
+            }
 
+            if (appProxy && !appProxyHost) {
+                // will only be asked if you want to install app-proxy but you give no host in the options
+                questions.push({
+                    type: 'input',
+                    name: 'appProxyHost',
+                    message: 'The hostname that will be used by the app-proxy ingress',
                 });
             }
 
@@ -343,7 +378,7 @@ const initCmd = new Command({
             kubeNamespace = kubeNamespace || answers.namespace;
             shouldMakeDefaultRe = _.isUndefined(shouldMakeDefaultRe) ? answers.shouldMakeDefaultRe : shouldMakeDefaultRe;
             shouldExecutePipeline = _.isUndefined(shouldExecutePipeline) ? answers.shouldExecutePipeline : shouldExecutePipeline;
-            ({ httpProxy, httpsProxy } = answers);
+            ({ httpProxy, httpsProxy, appProxyHost } = answers);
         }
 
         printInstallationOptionsSummary({
@@ -353,6 +388,8 @@ const initCmd = new Command({
             shouldExecutePipeline,
             httpProxy,
             httpsProxy,
+            appProxy,
+            appProxyHost,
         });
 
         if (token) {
@@ -402,6 +439,7 @@ const initCmd = new Command({
         _argv['set-default-runtime'] = shouldMakeDefaultRe;
         _argv['exec-demo-pipeline'] = shouldExecutePipeline;
         _argv['env-vars'] = envVars;
+        _argv['app-proxy-host'] = appProxyHost;
         installationPlan.addContext('argv', _argv);
 
         // run cluster acceptance tests
@@ -602,8 +640,10 @@ const initCmd = new Command({
                     verbose,
                     kubeConfigPath,
                     valuesFile,
+                    appProxyHost,
+                    appProxyIngressClass,
                 });
-                installationPlan.addContext('appProxyIP', `http://${appProxyIP}`);
+                installationPlan.addContext('appProxyIP', `${appProxyIP}`);
             },
             installationEvent: installationProgress.events.APP_PROXY_INSTALLED,
             condition: !!appProxy,

package.json

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