fix container image deployment

Author: mms-gianni

client/src/components/pipelines/appcard.vue

@@ -19,7 +19,7 @@
 
     <v-card-text>
         <v-row
-            v-if="this.app.buildpack != 'Docker'"
+            v-if="this.app.deploymentstrategy != 'docker'"
             class="mx-0"
         >
             <v-icon left small>mdi-git</v-icon>
@@ -28,7 +28,7 @@
             </div>
         </v-row>
         <v-row
-            v-if="this.app.buildpack == 'Docker'"
+            v-if="this.app.deploymentstrategy == 'docker'"
             class="mx-0"
         >
             <v-icon left small>mdi-docker</v-icon>
@@ -37,8 +37,8 @@
             </div>
         </v-row>
         <p></p>
-        <v-chip label class="mr-1"><span v-if="this.autodeploy">Autodeploy | </span>{{ this.app.branch }}</v-chip>
-        <v-chip label class="mr-1" v-if="this.app.commithash">{{ this.app.commithash }}</v-chip>
+        <v-chip label class="mr-1" v-if="this.app.deploymentstrategy != 'docker'"><span v-if="this.autodeploy">Autodeploy | </span>{{ this.app.branch }}</v-chip>
+        <v-chip label class="mr-1" v-if="this.app.deploymentstrategy != 'docker' && this.app.commithash">{{ this.app.commithash }}</v-chip>
 
     </v-card-text>
 

src/kubero.ts

@@ -188,13 +188,12 @@ export class Kubero {
 
     // create a new app in a specified pipeline and phase
     public async newApp(app: App) {
-        debug.log('create App: '+app.name+' in '+ app.pipeline+' phase: '+app.phase);
+        debug.log('create App: '+app.name+' in '+ app.pipeline+' phase: '+app.phase + ' deploymentstrategy: '+app.deploymentstrategy);
         const contextName = this.getContext(app.pipeline, app.phase);
         if (contextName) {
             await this.kubectl.createApp(app, contextName);
             this.appStateList.push(app);
 
-            let namespace = app.pipeline+'-'+app.phase;
             this._io.emit('updatedApps', "created");
             this.kubectl.createEvent('Normal', 'Created', 'app.created', 'created new app: '+app.name+' in '+ app.pipeline+' phase: '+app.phase);
         }

src/modules/application.ts

@@ -1,4 +1,3 @@
-import { env } from 'process';
 import { IApp, IKubectlMetadata, IKubectlApp, IGithubRepository, ICronjob, IPodSize} from '../types';
 import { IAddon } from './addons';
 

src/modules/kubectl.ts

@@ -162,10 +162,6 @@ export class Kubectl {
 
         let namespace = app.pipeline+'-'+app.phase;
 
-        let pipeline = await this.getPipeline(app.pipeline)
-        //appl.spec.gitrepo = pipeline.spec.github.repository //FIXME: this overwrites the gitrepo from the app. Is this required?
-        appl.spec.deploymentstrategy = pipeline.spec.deploymentstrategy
-
         await this.customObjectsApi.createNamespacedCustomObject(
             "application.kubero.dev",
             "v1alpha1",

src/routes/apps.ts

@@ -45,35 +45,15 @@ function createApp(req: Request,) : IApp {
         envVars: req.body.envvars,
         image: {
             containerPort: req.body.image.containerport,
-            repository: selectedBuildpack.repository,
-            tag: selectedBuildpack.tag || "main",
+            repository: req.body.image.repository,
+            tag: req.body.image.tag || "main",
             pullPolicy: "Always",
             fetch: selectedBuildpack.fetch,
             build: selectedBuildpack.build,
             run: selectedBuildpack.run,
         },
         web: req.body.web,
         worker: req.body.worker,
-        /*
-        web: {
-            replicaCount: req.body.webreplicas,
-            autoscaling: {
-                minReplicas: req.body.webreplicasrange[0] || 1,
-                maxReplicas: req.body.webreplicasrange[1] || 0,
-                targetCPUUtilizationPercentage: req.body.webtargetCPUUtilizationPercentage || 80,
-                targetMemoryUtilizationPercentage: req.body.webtargetMemoryUtilizationPercentage || 0
-            }
-        },
-        worker: {
-            replicaCount: req.body.workerreplicas,
-            autoscaling: {
-                minReplicas: req.body.workerreplicasrange[0] || 0,
-                maxReplicas: req.body.workerreplicasrange[1] || 0,
-                targetCPUUtilizationPercentage: req.body.workertargetCPUUtilizationPercentage || 80,
-                targetMemoryUtilizationPercentage: req.body.workertargetMemoryUtilizationPercentage || 0
-            }
-        },
-        */
         cronjobs: req.body.cronjobs,
         addons: req.body.addons,
         resources: req.body.podsize.resources,