Merge pull request #250 from kubero-dev/233-improve-external-buildpipeline

#233 improve external buildpipeline

Author: mms-gianni

client/src/components/apps/new.vue

@@ -1331,7 +1331,7 @@ export default {
           }
 
           // Backward compatibility older v1.11.1
-          if (this.buildpack.run && this.buildpack.run.readOnlyAppStorage === undefined) {
+          if (this.buildpack && this.buildpack.run && this.buildpack.run.readOnlyAppStorage === undefined) {
             this.buildpack.run.readOnlyAppStorage = true;
           }
         });
@@ -1374,7 +1374,7 @@ export default {
           }
 
           // Backward compatibility older v1.11.1
-          if (this.buildpack.run && this.buildpack.run.readOnlyAppStorage === undefined) {
+          if (this.buildpack && this.buildpack.run && this.buildpack.run.readOnlyAppStorage === undefined) {
             this.buildpack.run.readOnlyAppStorage = true;
           }
 
@@ -1508,7 +1508,7 @@ export default {
             this.ingress = response.data.spec.ingress || {};
 
             // Backward compatibility older v1.11.1
-            if (this.buildpack.run && this.buildpack.run.readOnlyAppStorage === undefined) {
+            if (this.buildpack && this.buildpack.run && this.buildpack.run.readOnlyAppStorage === undefined) {
               this.buildpack.run.readOnlyAppStorage = true;
             }
           });

client/src/components/pipelines/new.vue

@@ -506,6 +506,11 @@ export default {
           }
         }
 
+        // Bugfix: select a buildpack if none is selected, since it contains basic seciruty settings
+        if (this.buildpack === undefined) {
+          this.buildpack = this.buildpackList[0].value;
+        }
+
         axios.post(`/api/pipelines`, {
           pipelineName: this.pipelineName,
           domain: this.domain,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kubero",
-  "version": "1.9.0",
+  "version": "1.11",
   "description": "Heroku clone on Kubernetes",
   "main": "dist/index.js",
   "author": "Gianni Carafa",

src/kubero.ts

@@ -1194,4 +1194,18 @@ export class Kubero {
     public getClusterIssuer() {
         return this.config.clusterissuer;
     }
+
+    public deployApp(pipelineName: string, phaseName: string, appName: string, tag: string) {
+        debug.debug('deploy App: '+appName+' in '+ pipelineName+' phase: '+phaseName);
+
+        const contextName = this.getContext(pipelineName, phaseName);
+        const namespace = pipelineName+'-'+phaseName;
+
+        if (contextName) {
+            this.kubectl.setCurrentContext(contextName);
+            this.kubectl.deployApp(namespace, appName, tag);
+            this._io.emit('updatedApps', "deplyment_started");
+        }
+    }
+
 }

src/modules/kubectl.ts

@@ -28,6 +28,7 @@ import { IPipeline, IKubectlPipeline, IKubectlPipelineList, IKubectlAppList, IKu
 import { App, KubectlApp } from './application';
 import { KubectlPipeline } from './pipeline';
 import { IAddon, IAddonMinimal } from './addons';
+import { version } from 'os';
 
 
 export class Kubectl {
@@ -909,4 +910,49 @@ export class Kubectl {
         }
     }
 
+    public async deployAppDisabled(namespace: string, app: string, tag: string): Promise<any> {
+
+        console.log("deploy app: " + app, ",namespace: " + namespace, ",tag: " + tag);
+    }
+
+    public async deployApp(namespace: string, appName: string, tag: string) {
+
+        let deploymentName = appName+'-kuberoapp-web';
+        console.log("deploy app: " + appName, ",namespace: " + namespace, ",tag: " + tag, ",deploymentName: " + deploymentName);
+
+        // format : https://jsonpatch.com/
+        const patch = [
+            {
+              op: 'replace',
+              path: '/spec/image/tag',
+              value: tag,
+            },
+          ];
+
+        const apiVersion = "v1alpha1"
+        const group = "application.kubero.dev"
+        const plural = "kuberoapps"
+
+        const options = { "headers": { "Content-type": 'application/json-patch+json' } };
+        this.customObjectsApi.patchNamespacedCustomObject(
+            group,
+            apiVersion,
+            namespace,
+            plural,
+            appName,
+            patch,
+            undefined,
+            undefined,
+            undefined,
+            options
+        ).then(() => {
+            debug.log(`Deployment ${deploymentName} in Pipeline ${namespace} updated`);
+        }).catch(error => {
+            if (error.body.message) {
+                debug.log('ERROR: '+error.body.message);
+            }
+            debug.log('ERROR: '+error);
+        });
+    };
+
 }

src/routes/apps.ts

@@ -317,3 +317,20 @@ Router.get('/apps', authMiddleware, async function (req: Request, res: Response)
     // #swagger.summary = 'Get a list of running apps'
     res.send(await req.app.locals.kubero.getAppStateList());
 });
+
+// Used GET instead of POST to make it easier to use from the CLI
+// Not used in the UI yet
+Router.get('/cli/apps/:pipeline/:phase/:app/deploy/:tag', bearerMiddleware, async function (req: Request, res: Response) {
+    // #swagger.tags = ['Apps']
+    // #swagger.summary = 'Deploy a prebuilt app tag'
+    /* #swagger.security = [{
+            "bearerAuth": {
+                "type": 'http',
+                "scheme": 'bearer',
+                "bearerFormat": 'JWT',
+            }
+    }] */
+
+    req.app.locals.kubero.deployApp(req.params.pipeline, req.params.phase, req.params.app, req.params.tag);
+    res.send("deployed");
+});