Merge pull request #107 from andresmgot/kubeless0.4.0

Adapt to Kubeless 0.4

Author: andresmgot

.travis.yml

@@ -11,7 +11,7 @@ services:
   - docker
 env:
   global:
-    - KUBELESS_VERSION: 0.3.4
+    - KUBELESS_VERSION: 0.4.0
     - REPO_DOMAIN: serverless
     - REPO_NAME: serverless-kubeless
     - secure: "s+L8ndj0uMNwqbLvbHePHeMJw2LI8DdEdcq1vJ98hNwHOWQc2mHVB4utG9EZFkaL+RAZYduldSJqr443d2BugxrkmzhLUlM5vDks+zHeKecwTah2uuaMUXVT/y/cWDDTVp3phqSqWbHBMG6u0ImvTVWHpnkux55S3QJTHevvhdodpO6VDTsJCEB3e1d2hHxi0L9tJrFXzQRpooV8IUuODwKBJyhK4CD7rvu0D1gBgHaUNnNLrCy4YTaFl19q5NdZUtrQDC7rpSPOhFI9CBFX8GiFq6nY3XzFASwq/JtKc3K7OLIC7Wqb6JpuvFhG6S1yhBzp73pnoE9U0Bi+YMa3L+nPoh58dCB2ldNCCCMbx7R6PWq/TwYzLvgZZ7queC2kbvCTrtU6JJfmb0CxmX1fnUIpCsNeyXaPuo4Ly6WJeAID32z79CwMo9NH0uOVTLy3LTrLcEfELhBRL5+WkMvKmXUt8yN/jEIa/H38pQN5Y/AnJ0KznO8RZ2nLhi1cR+xUkxfPVZ22Wr2XkbzJDZih/mZR+5GQBfUHWgpUChK+e8dOhplk+4PZJEO6Myja7ykXBPYtL9CV/Xi+1nQqLmfhyChiES201KusJr1IrFklslzCzgrSH8Dv2yaYUTe/Ub/I3gWIhKOXY66gkpmB6MSBJUfMK3uR4/wYfCvbtBTugsY="

deploy/kubelessDeploy.js

@@ -18,6 +18,8 @@
 
 const _ = require('lodash');
 const BbPromise = require('bluebird');
+const Config = require('../lib/config');
+const crypto = require('crypto');
 const deploy = require('../lib/deploy');
 const fs = require('fs');
 const helpers = require('../lib/helpers');
@@ -86,19 +88,27 @@ class KubelessDeploy {
   deployFunction() {
     const runtime = this.serverless.service.provider.runtime;
     const populatedFunctions = [];
+    const kubelessConfig = new Config();
     return new BbPromise((resolve, reject) => {
-      _.each(this.serverless.service.functions, (description, name) => {
-        const pkg = this.options.package ||
-          this.serverless.service.package.path ||
-          description.package.artifact ||
-          this.serverless.config.serverless.service.artifact;
-        this.checkSize(pkg);
-        fs.readFile(pkg, { encoding: 'base64' }, (err, functionContent) => {
-          if (err) {
-            reject(err);
-          } else if (description.handler) {
-            const files = helpers.getRuntimeFilenames(runtime, description.handler);
-            this.getFileContent(pkg, files.deps)
+      kubelessConfig.init().then(() => {
+        _.each(this.serverless.service.functions, (description, name) => {
+          const pkg = this.options.package ||
+            this.serverless.service.package.path ||
+            description.package.artifact ||
+            this.serverless.config.serverless.service.artifact;
+          this.checkSize(pkg);
+          const s = fs.createReadStream(pkg);
+          const shasum = crypto.createHash('sha256');
+          let functionContent = '';
+          s.on('error', (err) => reject(err));
+          s.on('data', (data) => {
+            shasum.update(data);
+            functionContent += data.toString('base64');
+          });
+          s.on('end', () => {
+            if (description.handler) {
+              const depFile = helpers.getRuntimeDepfile(runtime, kubelessConfig);
+              this.getFileContent(pkg, depFile)
                 .catch(() => {
                   // No requirements found
                 })
@@ -107,6 +117,7 @@ class KubelessDeploy {
                     _.assign({}, description, {
                       id: name,
                       content: functionContent,
+                      checksum: `sha256:${shasum.digest('hex')}`,
                       deps: requirementsContent,
                       image: description.image || this.serverless.service.provider.image,
                       events: _.map(description.events, (event) => {
@@ -127,12 +138,13 @@ class KubelessDeploy {
                     resolve();
                   }
                 });
-          } else {
-            populatedFunctions.push(_.assign({}, description, { id: name }));
-            if (populatedFunctions.length === _.keys(this.serverless.service.functions).length) {
-              resolve();
+            } else {
+              populatedFunctions.push(_.assign({}, description, { id: name }));
+              if (populatedFunctions.length === _.keys(this.serverless.service.functions).length) {
+                resolve();
+              }
             }
-          }
+          });
         });
       });
     }).then(() => deploy(

lib/config.js

@@ -0,0 +1,62 @@
+/*
+ Copyright 2017 Bitnami.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+'use strict';
+
+const _ = require('lodash');
+const helpers = require('./helpers');
+const request = require('request');
+
+class Config {
+  constructor(options) {
+    const opts = _.defaults({}, options, {
+      namespace: 'kubeless',
+    });
+    this.namespace = opts.namespace;
+    const APIRootUrl = helpers.getKubernetesAPIURL(helpers.loadKubeConfig());
+    const url = `${APIRootUrl}/api/v1/namespaces/${opts.namespace}/configmaps/kubeless-config`;
+    this.connectionOptions = Object.assign(
+            helpers.getConnectionOptions(helpers.loadKubeConfig()),
+            { url, json: true }
+        );
+    this.configMag = {};
+  }
+  init() {
+    const data = [];
+    return new Promise((resolve, reject) => {
+      request.get(this.connectionOptions)
+            .on('error', err => {
+              reject(err);
+            })
+            .on('data', (d) => {
+              data.push(d);
+            })
+            .on('end', () => {
+              const res = Buffer.concat(data).toString();
+              this.configMag = JSON.parse(res);
+              resolve();
+            });
+    });
+  }
+  get(key, opt) {
+    if (opt && opt.parse) {
+      return JSON.parse(this.configMag.data[key]);
+    }
+    return this.configMag.data[key];
+  }
+}
+
+module.exports = Config;

lib/deploy.js

@@ -32,6 +32,7 @@ function getFunctionDescription(
     deps,
     funcContent,
     contentType,
+    checksum,
     handler,
     desc,
     labels,
@@ -45,22 +46,27 @@ function getFunctionDescription(
     secrets
 ) {
   const funcs = {
-    apiVersion: 'k8s.io/v1',
+    apiVersion: 'kubeless.io/v1beta1',
     kind: 'Function',
     metadata: {
       name: funcName,
       namespace,
+      labels: _.assign({}, labels, {
+        'created-by': 'kubeless',
+        function: funcName,
+      }),
     },
     spec: {
       deps: deps || '',
       function: funcContent,
+      checksum,
       'function-content-type': contentType,
       handler,
       runtime,
       timeout: String(timeout || '180'),
       service: {
         ports: [{
-          name: 'function-port',
+          name: 'http-function-port',
           port: Number(port || 8080),
           protocol: 'TCP',
           targetPort: Number(port || 8080),
@@ -77,9 +83,6 @@ function getFunctionDescription(
       'kubeless.serverless.com/description': desc,
     };
   }
-  if (labels) {
-    funcs.metadata.labels = labels;
-  }
   if (image || env || memory || secrets) {
     const container = {
       name: funcName,
@@ -111,19 +114,25 @@ function getFunctionDescription(
         requests: { memory: memoryWithSuffix },
       };
     }
-    funcs.spec.template = {
-      spec: { containers: [container] },
+    funcs.spec.deployment = {
+      spec: {
+        template: {
+          spec: {
+            containers: [container],
+          },
+        },
+      },
     };
     if (secrets !== undefined && secrets.length > 0) {
       if (container.volumeMounts === undefined) {
         container.volumeMounts = [];
       }
-      if (funcs.spec.template.spec.volumes === undefined) {
-        funcs.spec.template.spec.volumes = [];
+      if (funcs.spec.deployment.spec.template.spec.volumes === undefined) {
+        funcs.spec.deployment.spec.template.spec.volumes = [];
       }
       secrets.forEach(secret => {
         container.volumeMounts.push({ name: `${secret}-vol`, mountPath: `/${secret}` });
-        funcs.spec.template.spec.volumes
+        funcs.spec.deployment.spec.template.spec.volumes
           .push({ name: `${secret}-vol`, secret: { secretName: secret } });
       });
     }
@@ -342,6 +351,7 @@ function deploy(functions, runtime, options) {
               description.deps,
               description.content,
               options.contentType,
+              description.checksum,
               description.handler,
               description.description,
               description.labels,

lib/functions.js

@@ -27,7 +27,7 @@ class Functions {
     });
     this.namespace = opts.namespace;
     const APIRootUrl = helpers.getKubernetesAPIURL(helpers.loadKubeConfig());
-    const url = `${APIRootUrl}/apis/k8s.io/v1/namespaces/${opts.namespace}/functions/`;
+    const url = `${APIRootUrl}/apis/kubeless.io/v1beta1/namespaces/${opts.namespace}/functions/`;
     this.connectionOptions = Object.assign(
         helpers.getConnectionOptions(helpers.loadKubeConfig()),
         { url, json: true }

lib/helpers.js

@@ -177,29 +177,20 @@ function warnUnsupportedOptions(unsupportedOptions, definedOptions, logFunction)
   });
 }
 
-function getRuntimeFilenames(runtime, handler) {
-  let files = null;
-  if (runtime.match(/python/)) {
-    files = {
-      handler: `${handler.toString().split('.')[0]}.py`,
-      deps: 'requirements.txt',
-    };
-  } else if (runtime.match(/node/)) {
-    files = {
-      handler: `${handler.toString().split('.')[0]}.js`,
-      deps: 'package.json',
-    };
-  } else if (runtime.match(/ruby/)) {
-    files = {
-      handler: `${handler.toString().split('.')[0]}.rb`,
-      deps: 'Gemfile',
-    };
-  } else {
+function getRuntimeDepfile(runtime, configMap) {
+  const runtimesInfo = configMap.get('runtime-images', { parse: true });
+  let depFile = null;
+  _.each(runtimesInfo, r => {
+    if (runtime.match(r.ID)) {
+      depFile = r.depName;
+    }
+  });
+  if (!depFile) {
     throw new Error(
       `The runtime ${runtime} is not supported yet`
     );
   }
-  return files;
+  return depFile;
 }
 
 module.exports = {
@@ -208,5 +199,5 @@ module.exports = {
   getKubernetesAPIURL,
   getDefaultNamespace,
   getConnectionOptions,
-  getRuntimeFilenames,
+  getRuntimeDepfile,
 };

package.json

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