Merge pull request #74 from kubero-dev/66-add-persistent-volumes

mms-gianni · web-flow · commit 281ba30754dc · 2023-01-07T23:29:25.000+01:00
Feature/Add persistent volumes
diff --git a/client/src/components/apps/new.vue b/client/src/components/apps/new.vue
@@ -366,6 +366,89 @@
         </v-col>
       </v-row>
 
+      <v-divider class="ma-5"></v-divider>
+      <!-- EXTRAVOLUMES -->
+      <h4 class="text-uppercase">Volumes</h4>
+      <div v-for="volume in extraVolumes" v-bind:key="volume.id">
+        <v-row>
+          <v-col
+            cols="12"
+            md="3"
+          >
+            <v-text-field
+              v-model="volume.name"
+              label="name"
+              :readonly="app!='new'"
+            ></v-text-field>
+          </v-col>
+          <v-col
+            cols="12"
+            md="2"
+          >
+            <v-text-field
+              v-model="volume.size"
+              label="size"
+              :readonly="app!='new'"
+            ></v-text-field>
+          </v-col>
+          <v-col
+            cols="12"
+            md="1"
+          >
+            <v-btn
+            elevation="2"
+            icon
+            small
+            @click="removeVolumeLine(volume.name)"
+            >
+                <v-icon dark >
+                    mdi-minus
+                </v-icon>
+            </v-btn>
+          </v-col>
+        </v-row>
+
+        <v-row>
+          <v-col
+            cols="12"
+            md="3"
+          >
+            <v-select
+              v-model="volume.storageClass"
+              :items="storageclasses"
+              label="Storage Class"
+              :readonly="app!='new'"
+            ></v-select>
+          </v-col>
+          <v-col
+            cols="12"
+            md="3"
+          >
+            <v-text-field
+              v-model="volume.mountPath"
+              label="Mount Path"
+            ></v-text-field>
+          </v-col>
+        </v-row>
+      </div>
+
+      <v-row>
+        <v-col
+          cols="12"
+        >
+          <v-btn
+          elevation="2"
+          icon
+          small
+          @click="addVolumeLine()"
+          >
+              <v-icon dark >
+                  mdi-plus
+              </v-icon>
+          </v-btn>
+        </v-col>
+      </v-row>
+
       <v-divider class="ma-5"></v-divider>
       <!-- CRONJOBS -->
       <h4 class="text-uppercase">Cronjobs</h4>
@@ -615,6 +698,24 @@ export default {
         },
         */
       ],
+      storageclasses : [
+/*
+        'standard',
+        'standard-fast',
+*/
+      ],
+      extraVolumes: [
+        /*
+        {
+          name: 'example-volume',
+          emptyDir: false,
+          storageClass: 'standard',
+          size: '1Gi',
+          accessMode: ['ReadWriteOnce']
+          mountPath: '/example/path',
+        },
+        */
+      ],
       addons: [
         /*
         {
@@ -660,6 +761,7 @@ export default {
       }
     },
     mounted() {
+      this.loadStorageClasses();
       this.loadPipeline();
       this.loadPodsizeList();
       this.loadApp(); // this may lead into a race condition with the buildpacks loaded in loadPipeline
@@ -703,6 +805,13 @@ export default {
 
         });
       },
+      loadStorageClasses() {
+        axios.get('/api/config/storageclasses').then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.storageclasses.push(response.data[i].name);
+          }
+        });
+      },
       loadBranches() {
 
         // encode string to base64 (for ssh url)
@@ -786,6 +895,7 @@ export default {
             this.autodeploy = response.data.spec.autodeploy;
             this.domain = response.data.spec.domain;
             this.envvars = response.data.spec.envVars;
+            this.extraVolumes = response.data.spec.extraVolumes;
             this.containerPort = response.data.spec.image.containerPort;
             this.podsize = response.data.spec.podsize;
             this.autoscale = response.data.spec.autoscale;
@@ -838,6 +948,7 @@ export default {
               targetMemoryUtilizationPercentage : 80,
             },
           },
+          extraVolumes: this.extraVolumes,
           cronjobs: this.cronjobFormat(this.cronjobs),
           addons: this.addons,
 
@@ -899,6 +1010,7 @@ export default {
               targetMemoryUtilizationPercentage : 80,
             },
           },
+          extraVolumes: this.extraVolumes,
           cronjobs: this.cronjobFormat(this.cronjobs),
           addons: this.addons,
         })
@@ -924,6 +1036,25 @@ export default {
           }
         }
       },
+      addVolumeLine() {
+        this.extraVolumes.push({
+          name: 'example-volume',
+          emptyDir: false,
+          storageClass: 'standard',
+          size: '1Gi',
+          accessModes: [
+            'ReadWriteOnce',
+          ],
+          mountPath: '/example/path',
+        });
+      },
+      removeVolumeLine(index) {
+        for (let i = 0; i < this.extraVolumes.length; i++) {
+          if (this.extraVolumes[i].name === index) {
+            this.extraVolumes.splice(i, 1);
+          }
+        }
+      },
       addCronjobLine() {
         this.cronjobs.push({
           name: 'hello world',
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kubero",
-  "version": "1.5.3",
+  "version": "1.6.0",
   "description": "Heroku clone on Kubernetes",
   "main": "dist/index.js",
   "author": "Gianni Carafa",
diff --git a/src/kubero.ts b/src/kubero.ts
@@ -497,6 +497,7 @@ export class Kubero {
                     podsize: this.config.podSizeList[0], //TODO select from podsizelist
                     autoscale: false,
                     envVars: [], //TODO use custom env vars,
+                    extraVolumes: [], //TODO Not sure how to handlle extra Volumes on PR Apps
                     image: {
                         containerPort: 8080, //TODO use custom containerport
                         repository: pipeline.dockerimage, // FIXME: Maybe needs a lookup into buildpack
@@ -703,4 +704,8 @@ export class Kubero {
     public getNodeMetrics() {
         return this.kubectl.getNodeMetrics();
     }
+
+    public getStorageglasses() {
+        return this.kubectl.getStorageglasses();
+    }
 }
diff --git a/src/modules/application.ts b/src/modules/application.ts
@@ -1,4 +1,4 @@
-import { IApp, IKubectlMetadata, IKubectlApp, IGithubRepository, ICronjob, IPodSize} from '../types';
+import { IApp, IKubectlMetadata, IKubectlApp, IGithubRepository, ICronjob, IPodSize, IExtraVolume} from '../types';
 import { IAddon } from './addons';
 
 export class KubectlApp implements IKubectlApp{
@@ -34,6 +34,7 @@ export class App implements IApp{
     public autoscale: boolean
     //public envVars: {[key: string]: string} = {}
     public envVars: {}[] = []
+    public extraVolumes: IExtraVolume[] = []
     public cronjobs: ICronjob[] = []
     public addons: IAddon[] = []
 
@@ -156,6 +157,8 @@ export class App implements IApp{
 
         this.envVars =  app.envVars
 
+        this.extraVolumes =  app.extraVolumes
+
         this.cronjobs = app.cronjobs
 
         this.addons = app.addons
diff --git a/src/modules/kubectl.ts b/src/modules/kubectl.ts
@@ -21,6 +21,7 @@ import {
     PodMetric,
     PodMetricsList,
     NodeMetric,
+    StorageV1Api
 } from '@kubernetes/client-node'
 import { IPipeline, IKubectlPipeline, IKubectlPipelineList, IKubectlAppList, IKuberoConfig} from '../types';
 import { App, KubectlApp } from './application';
@@ -34,6 +35,7 @@ export class Kubectl {
     private coreV1Api: CoreV1Api;
     private appsV1Api: AppsV1Api;
     private metricsApi: Metrics;
+    private storageV1Api: StorageV1Api;
     private customObjectsApi: CustomObjectsApi;
     private kubeVersion: VersionInfo | void;
     private patchUtils: PatchUtils;
@@ -66,6 +68,7 @@ export class Kubectl {
         this.versionApi = this.kc.makeApiClient(VersionApi);
         this.coreV1Api = this.kc.makeApiClient(CoreV1Api);
         this.appsV1Api = this.kc.makeApiClient(AppsV1Api);
+        this.storageV1Api = this.kc.makeApiClient(StorageV1Api);
         this.metricsApi = new Metrics(this.kc);
         this.patchUtils = new PatchUtils();
         this.customObjectsApi = this.kc.makeApiClient(CustomObjectsApi);
@@ -491,4 +494,22 @@ export class Kubectl {
         const metrics = await this.metricsApi.getNodeMetrics();
         return metrics.items;
     }
+
+    public async getStorageglasses(): Promise<Object[]> {
+        const storageClasses = await this.storageV1Api.listStorageClass();
+        let ret = [];
+        for (let i = 0; i < storageClasses.body.items.length; i++) {
+            const sc = storageClasses.body.items[i];
+            const storageClass = {
+                name: sc.metadata?.name,
+                provisioner: sc.provisioner,
+                reclaimPolicy: sc.reclaimPolicy,
+                volumeBindingMode: sc.volumeBindingMode,
+                //allowVolumeExpansion: sc.allowVolumeExpansion,
+                //parameters: sc.parameters
+            }
+            ret.push(storageClass);
+        }
+        return ret;
+    }
 }
diff --git a/src/routes/apps.ts b/src/routes/apps.ts
@@ -184,6 +184,7 @@ function createApp(req: Request,) : IApp {
         podsize: req.body.podsize,
         autoscale: req.body.autoscale,
         envVars: req.body.envvars,
+        extraVolumes: req.body.extraVolumes,
         image: {
             containerPort: req.body.image.containerport,
             repository: req.body.image.repository,
diff --git a/src/routes/config.ts b/src/routes/config.ts
@@ -99,3 +99,10 @@ Router.get('/config/repositories', authMiddleware, async function (req: Request,
     // #swagger.summary = 'Get the available repositories'
     res.send(await req.app.locals.kubero.getRepositories());
 });
+
+
+Router.get('/config/storageclasses', authMiddleware, async function (req: Request, res: Response) {
+    // #swagger.tags = ['UI']
+    // #swagger.summary = 'Get the available storageclasses'
+    res.send(await req.app.locals.kubero.getStorageglasses());
+});
diff --git a/src/routes/pipelines.ts b/src/routes/pipelines.ts
@@ -201,6 +201,7 @@ Router.put('/pipelines/:pipeline/:phase/:app', authMiddleware, async function (r
         domain: req.body.domain,
         podsize: req.body.podsize,
         autoscale: req.body.autoscale,
+        extraVolumes: req.body.extraVolumes,
         envVars: req.body.envvars,
         image: {
             containerPort: req.body.image.containerport,
diff --git a/src/types.ts b/src/types.ts
@@ -78,6 +78,7 @@ export interface IApp {
         }
     }
 
+    extraVolumes: IExtraVolume[],
     cronjobs: ICronjob[]
     addons: IAddon[]
 /*
@@ -123,6 +124,15 @@ export interface IApp {
 */
 }
 
+export interface IExtraVolume {
+    name: string,
+    mountPath: string,
+    emptyDir: boolean,
+    size: string,
+    storageClass: string,
+    accessModes: string[],
+}
+
 export interface ICronjob {
     name: string,
     schedule: string,
diff --git a/swagger.json b/swagger.json
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "kubero",`
`3`		`- "version": "1.5.3",`
	`3`	`+ "version": "1.6.0",`
`4`	`4`	`"description": "Heroku clone on Kubernetes",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"author": "Gianni Carafa",`