Merge pull request #56 from andresmgot/metadataSchema

Place labels and descriptions inside the metadata definition

Author: andresmgot

deploy/kubelessDeploy.js

@@ -54,12 +54,12 @@ function getFunctionDescription(
     },
   };
   if (desc) {
-    funcs.annotations = {
+    funcs.metadata.annotations = {
       'kubeless.serverless.com/description': desc,
     };
   }
   if (labels) {
-    funcs.labels = labels;
+    funcs.metadata.labels = labels;
   }
   if (env || memory) {
     const container = {

info/kubelessInfo.js

@@ -168,8 +168,8 @@ class KubelessInfo {
                   topic: fDesc.spec.topic,
                   type: fDesc.spec.type,
                   deps: fDesc.spec.deps,
-                  annotations: fDesc.annotations,
-                  labels: fDesc.labels,
+                  annotations: fDesc.metadata.annotations,
+                  labels: fDesc.metadata.labels,
                   selfLink: fDesc.metadata.selfLink,
                   uid: fDesc.metadata.uid,
                   timestamp: fDesc.metadata.creationTimestamp,

test/kubelessDeploy.test.js

@@ -673,7 +673,7 @@ describe('KubelessDeploy', () => {
       expect(thirdPartyResources.ns.functions.post.calledOnce).to.be.eql(true);
       expect(
         thirdPartyResources.ns.functions.post
-          .firstCall.args[0].body.annotations['kubeless.serverless.com/description']
+          .firstCall.args[0].body.metadata.annotations['kubeless.serverless.com/description']
       ).to.be.eql(desc);
       return result;
     });
@@ -692,7 +692,7 @@ describe('KubelessDeploy', () => {
       ).to.be.fulfilled;
       expect(thirdPartyResources.ns.functions.post.calledOnce).to.be.eql(true);
       expect(
-        thirdPartyResources.ns.functions.post.firstCall.args[0].body.labels
+        thirdPartyResources.ns.functions.post.firstCall.args[0].body.metadata.labels
       ).to.be.eql(labels);
       return result;
     });

test/kubelessInfo.test.js

@@ -304,7 +304,7 @@ describe('KubelessInfo', () => {
     it('should return the description in case it exists', (done) => {
       mockGetCalls(
         [{ name: func, namespace: 'default' }],
-        { annotations: { 'kubeless.serverless.com/description': 'Test Description' } }
+        { metadata: { annotations: { 'kubeless.serverless.com/description': 'Test Description' } } }
       );
       const kubelessInfo = new KubelessInfo(serverless, { function: func });
       kubelessInfo.infoFunction({ color: false }).then((message) => {
@@ -315,7 +315,7 @@ describe('KubelessInfo', () => {
     it('should return the labels in case they exist', (done) => {
       mockGetCalls(
         [{ name: func, namespace: 'default' }],
-        { labels: { label1: 'text1', label2: 'text2' } }
+        { metadata: { labels: { label1: 'text1', label2: 'text2' } } }
       );
       const kubelessInfo = new KubelessInfo(serverless, { function: func });
       kubelessInfo.infoFunction({ color: false }).then((message) => {