Merge pull request #108 from andresmgot/kubeless0.5

[WIP] Adapt to Kubeless 0.5

Author: andresmgot

.gitignore

@@ -9,3 +9,4 @@ node-dependencies-*
 ksonnet-lib
 kubeless_linux-amd64.zip
 test/kubeless.jsonnet
+test/kafka-zookeeper.jsonnet

.travis.yml

@@ -1,7 +1,6 @@
 language: node_js
 node_js:
-  - "8"
-  - "6"
+  - "9"
 script:
   - npm run lint
   - npm test
@@ -11,7 +10,7 @@ services:
   - docker
 env:
   global:
-    - KUBELESS_VERSION: 0.4.0
+    - KUBELESS_VERSION: 0.5.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

@@ -55,13 +55,6 @@ class KubelessDeploy {
       this.options,
       this.serverless.cli.log.bind(this.serverless.cli)
     );
-    // Check that functions don't have more than one event source
-    // since it is not supported yet
-    _.each(this.serverless.service.functions, f => {
-      if (f.events && f.events.length > 1) {
-        throw new Error('It is not supported to have more than one event source yet');
-      }
-    });
     return BbPromise.resolve();
   }
 
@@ -150,6 +143,7 @@ class KubelessDeploy {
     }).then(() => deploy(
       populatedFunctions,
       runtime,
+      this.serverless.service.service,
       {
         namespace: this.serverless.service.provider.namespace,
         hostname: this.serverless.service.provider.hostname,

deployFunction/kubelessDeployFunction.js

@@ -26,6 +26,10 @@ class KubelessDeployFunction extends KubelessDeploy {
     if (this.options.v) this.options.verbose = true;
     this.options.force = true;
     this.hooks = {
+      'deploy:function:initialize': () => BbPromise.bind(this)
+        .then(this.excludes),
+      'deploy:function:packageFunction': () => this.serverless.pluginManager
+        .spawn('package:function'),
       'deploy:function:deploy': () => BbPromise.bind(this)
       .then(this.validate)
       .then(this.deployFunction),

examples/event-trigger-python/handler.py

@@ -1,2 +1,2 @@
-def events(context):
-    return context
+def events(event, context):
+    print event['data']

examples/event-trigger-python/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "Example function for serverless kubeless",
   "dependencies": {
-    "serverless-kubeless": "^0.2.0"
+    "serverless-kubeless": "^0.4.0"
   },
   "devDependencies": {},
   "scripts": {

examples/get-python/handler.py

@@ -1,2 +1,2 @@
-def hello():
+def hello(event, context):
     return "hello world"

examples/get-python/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "Example function for serverless kubeless",
   "dependencies": {
-    "serverless-kubeless": "^0.2.0"
+    "serverless-kubeless": "^0.4.0"
   },
   "devDependencies": {},
   "scripts": {

examples/get-ruby/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "Example function for serverless kubeless",
   "dependencies": {
-    "serverless-kubeless": "^0.2.0"
+    "serverless-kubeless": "^0.4.0"
   },
   "devDependencies": {},
   "scripts": {

examples/get-ruby/version.rb

@@ -1,5 +1,5 @@
 # Obtains the latest Kubeless release published
-def run(request)
+def run(event, context)
     require "net/https"
     require "uri"
     require "json"