Merge pull request #119 from andresmgot/label

Parse labels as strings
serverless · May 21, 2018 · 247649e · 247649e
2 parents cc063bd + d10f4d5
commit 247649e
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 9 deletions.
diff --git a/lib/deploy.js b/lib/deploy.js
@@ -24,6 +24,22 @@ const helpers = require('./helpers');
 const ingressHelper = require('./ingress');
 const moment = require('moment');
 
+function forceString(obj) {
+  const result = {};
+  _.each(obj, (v, k) => {
+    if (v === null) {
+      result[k] = 'null';
+    } else if (v === undefined) {
+      result[k] = 'undefined';
+    } else if (typeof v === 'object') {
+      result[k] = JSON.stringify(v);
+    } else {
+      result[k] = v.toString();
+    }
+  });
+  return result;
+}
+
 function getFunctionDescription(
     funcName,
     namespace,
@@ -48,10 +64,10 @@ function getFunctionDescription(
     metadata: {
       name: funcName,
       namespace,
-      labels: _.assign({}, labels, {
+      labels: forceString(_.assign({}, labels, {
         'created-by': 'kubeless',
         function: funcName,
-      }),
+      })),
     },
     spec: {
       deps: deps || '',
@@ -68,9 +84,9 @@ function getFunctionDescription(
           protocol: 'TCP',
           targetPort: Number(port || 8080),
         }],
-        selector: _.assign({}, labels, {
+        selector: {
           function: funcName,
-        }),
+        },
         type: 'ClusterIP',
       },
     },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-kubeless",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "This plugin enables support for Kubeless within the [Serverless Framework](https://github.com/serverless).",
   "main": "index.js",
   "directories": {

diff --git a/test/examples-test.js b/test/examples-test.js
@@ -532,7 +532,7 @@ describe('Examples', () => {
                         if (stdout.match(/mongodb-.*Running/)) {
                           exec('kubectl logs -l io.kompose.service=mongodb', (lerr, logs) => {
                             if (lerr) throw lerr;
-                            if (logs.match(/waiting for connections on port 27017/)) {
+                            if (logs.match(/Starting mongod/)) {
                               clearInterval(wait);
                               exec(
                                 'serverless info',

diff --git a/test/kubelessDeploy.test.js b/test/kubelessDeploy.test.js
@@ -592,15 +592,30 @@ describe('KubelessDeploy', () => {
     });
     it('should deploy a function with labels', () => {
       const serverlessWithCustomNamespace = _.cloneDeep(serverlessWithFunction);
-      const labels = { label1: 'Test Label' };
+      const labels = {
+        label1: 'Test Label',
+        label2: false,
+        label3: null,
+        label4: undefined,
+        label5: 1,
+        label6: { a: 1 },
+      };
+      const sLabels = {
+        label1: 'Test Label',
+        label2: 'false',
+        label3: 'null',
+        label4: 'undefined',
+        label5: '1',
+        label6: '{"a":1}',
+      };
       serverlessWithCustomNamespace.service.functions[functionName].labels = labels;
       kubelessDeploy = instantiateKubelessDeploy(
         pkgFile,
         depsFile,
         serverlessWithCustomNamespace
       );
       mocks.createDeploymentNocks(
-        config.clusters[0].cluster.server, functionName, defaultFuncSpec(), { labels });
+        config.clusters[0].cluster.server, functionName, defaultFuncSpec(), { labels: sLabels });
       const result = expect( // eslint-disable-line no-unused-expressions
         kubelessDeploy.deployFunction()
       ).to.be.fulfilled;

diff --git a/test/lib/mocks.js b/test/lib/mocks.js
@@ -118,7 +118,7 @@ function createDeploymentNocks(endpoint, func, funcSpec, options) {
     };
   }
   if (opts.labels) {
-    postBody.spec.service.selector = _.assign(postBody.spec.service.selector, opts.labels);
+    postBody.spec.service.selector = _.assign(postBody.spec.service.selector);
   }
   nock(endpoint)
     .persist()