Support for Volumes (#194)

Author: ddoowa

lib/deploy.js

@@ -80,7 +80,9 @@ function getFunctionDescription(
     secrets,
     cpu,
     affinity,
-    tolerations
+    tolerations,
+    volumes,
+    volumeMounts
 ) {
   const funcs = {
     apiVersion: 'kubeless.io/v1beta1',
@@ -119,7 +121,8 @@ function getFunctionDescription(
   if (desc) {
     funcs.metadata.annotations['kubeless.serverless.com/description'] = desc;
   }
-  if (image || env || memory || secrets || cpu || affinity || tolerations) {
+
+  if (image || env || memory || secrets || cpu || affinity || tolerations || volumes) {
     const container = {
       name: funcName,
     };
@@ -154,20 +157,37 @@ function getFunctionDescription(
         },
       },
     };
+
+    // convert secretes to volumes and volume mounts
     if (secrets !== undefined && secrets.length > 0) {
-      if (container.volumeMounts === undefined) {
-        container.volumeMounts = [];
+      if (volumes === undefined) {
+        // eslint-disable-next-line no-param-reassign
+        volumes = [];
       }
-      if (funcs.spec.deployment.spec.template.spec.volumes === undefined) {
-        funcs.spec.deployment.spec.template.spec.volumes = [];
+      if (volumeMounts === undefined) {
+        // eslint-disable-next-line no-param-reassign
+        volumeMounts = [];
       }
       secrets.forEach(secret => {
-        container.volumeMounts.push({ name: `${secret}-vol`, mountPath: `/${secret}` });
-        funcs.spec.deployment.spec.template.spec.volumes
-          .push({ name: `${secret}-vol`, secret: { secretName: secret } });
+        volumes.push({
+          name: `${secret}-vol`,
+          secret: { secretName: secret },
+        });
+        volumeMounts.push({
+          mountPath: `/${secret}`,
+          name: `${secret}-vol`,
+        });
       });
     }
 
+    if (volumes !== undefined && volumes.length > 0) {
+      funcs.spec.deployment.spec.template.spec.volumes = volumes;
+    }
+
+    if (volumeMounts !== undefined && volumeMounts.length > 0) {
+      container.volumeMounts = volumeMounts;
+    }
+
     if (affinity) {
       funcs.spec.deployment.spec.template.spec.affinity = affinity;
     }
@@ -178,6 +198,7 @@ function getFunctionDescription(
   return funcs;
 }
 
+
 function waitForDeployment(funcName, requestMoment, namespace, options) {
   const opts = _.defaults({}, options, {
     verbose: false,
@@ -420,6 +441,7 @@ function deployFunction(f, namespace, runtime, contentType, options) {
     const fenv = parseEnv(f.environment);
     environment = environment ? environment.concat(fenv) : fenv;
   }
+
   const funcs = getFunctionDescription(
     f.id,
     namespace,
@@ -441,8 +463,11 @@ function deployFunction(f, namespace, runtime, contentType, options) {
     f.secrets,
     f.cpu || options.cpu,
     f.affinity || options.affinity,
-    f.tolerations || options.tolerations
+    f.tolerations || options.tolerations,
+    f.volumes || options.volumes,
+      f.volumeMounts || options.volumeMounts
   );
+
   return functionsApi.getItem(funcs.metadata.name).then((res) => {
     if (res.code === 404) {
       return deployFunctionAndWait(

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-kubeless",
-  "version": "0.8.3",
+  "version": "0.9.0",
   "description": "This plugin enables support for Kubeless within the [Serverless Framework](https://github.com/serverless).",
   "main": "index.js",
   "directories": {

package.json

@@ -367,9 +367,9 @@ describe('KubelessDeploy', () => {
       const serverlessWithSecrets = _.cloneDeep(serverlessWithFunction);
       serverlessWithSecrets.service.functions.myFunction.secrets = ['secret1'];
       kubelessDeploy = instantiateKubelessDeploy(
-        pkgFile,
-        depsFile,
-        serverlessWithSecrets
+          pkgFile,
+          depsFile,
+          serverlessWithSecrets
       );
       mocks.createDeploymentNocks(config.clusters[0].cluster.server, functionName, defaultFuncSpec({
         deployment: {
@@ -387,9 +387,46 @@ describe('KubelessDeploy', () => {
         },
       }));
       return expect( // eslint-disable-line no-unused-expressions
-        kubelessDeploy.deployFunction()
+          kubelessDeploy.deployFunction()
       ).to.be.fulfilled;
     });
+    it('should deploy a function with volumes', () => {
+      const serverlessWithVolumes = _.cloneDeep(serverlessWithFunction);
+      serverlessWithVolumes.service.functions.myFunction.volumes = [{
+        name: 'vol1',
+        persistentVolumeClaim: {
+          claimName: 'vol-claim',
+        },
+      }];
+      serverlessWithVolumes.service.functions.myFunction.volumeMounts = [{
+        name: 'vol1',
+        mountPath: '/foo/bar',
+      }];
+      kubelessDeploy = instantiateKubelessDeploy(
+          pkgFile,
+          depsFile,
+          serverlessWithVolumes
+      );
+      mocks.createDeploymentNocks(config.clusters[0].cluster.server, functionName, defaultFuncSpec({
+        deployment: {
+          spec: {
+            template: {
+              spec: {
+                containers: [{
+                  name: functionName,
+                  volumeMounts: [{ name: 'vol1', mountPath: '/foo/bar' }],
+                }],
+                volumes: [{ name: 'vol1', persistentVolumeClaim: { claimName: 'vol-claim' } }],
+              },
+            },
+          },
+        },
+      }));
+      return expect( // eslint-disable-line no-unused-expressions
+          kubelessDeploy.deployFunction()
+      ).to.be.fulfilled;
+    });
+
 
     it('should wait until a deployment is ready', () => {
       const funcSpec = defaultFuncSpec();