Namespace not used when getting services and pods (#159)

* Scope to namespaces * 0.6.1
serverless · Nov 30, 2018 · f2aedb3 · f2aedb3
1 parent dfb6bc3
commit f2aedb3
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 41 deletions.
diff --git a/lib/deploy.js b/lib/deploy.js
@@ -198,7 +198,7 @@ function waitForDeployment(funcName, requestMoment, namespace, options) {
         reject(`Unable to retrieve the status of the ${funcName} deployment`);
       }
       let runningPods = 0;
-      core.pods.get((err, podsInfo) => {
+      core.ns.pods.get((err, podsInfo) => {
         if (err) {
           if (err.message.match(/request timed out/)) {
             opts.log('Request timed out. Retrying...');

diff --git a/lib/get-info.js b/lib/get-info.js
@@ -94,7 +94,7 @@ function info(functions, service, options) {
       const core = new Api.Core(connectionOptions);
       const functionsApi = new CRD('apis/kubeless.io', 'v1beta1', namespace, 'functions');
       const extensions = new Api.Extensions(connectionOptions);
-      core.services.get((err, servicesInfo) => {
+      core.ns.services.get((err, servicesInfo) => {
         if (err) reject(new Error(err));
         functionsApi.getItem(f).catch((ferr) => reject(ferr)).then(fDesc => {
           extensions.ns.ingress(service).get((ierr, fIngress) => {

diff --git a/lib/invoke.js b/lib/invoke.js
@@ -112,7 +112,7 @@ function invoke(func, data, funcsDesc, options) {
         resolve(response);
       }
     };
-    core.services.get((err, servicesInfo) => {
+    core.ns.services.get((err, servicesInfo) => {
       if (err) {
         reject(err);
       } else {

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

diff --git a/test/kubelessDeploy.test.js b/test/kubelessDeploy.test.js
@@ -346,7 +346,7 @@ describe('KubelessDeploy', () => {
       const funcSpec = defaultFuncSpec();
       // First call, still deploying:
       nock(config.clusters[0].cluster.server)
-        .get('/api/v1/pods')
+        .get('/api/v1/namespaces/default/pods')
         .reply(200, {
           items: [{
             metadata: {
@@ -372,7 +372,7 @@ describe('KubelessDeploy', () => {
       const funcSpec = defaultFuncSpec();
       // First call, still deploying:
       nock(config.clusters[0].cluster.server)
-        .get('/api/v1/pods')
+        .get('/api/v1/namespaces/default/pods')
         .reply(200, {
           items: [{
             metadata: {
@@ -395,7 +395,7 @@ describe('KubelessDeploy', () => {
     it('should throw an error if the pod failed to start', () => {
       const funcSpec = defaultFuncSpec();
       nock(config.clusters[0].cluster.server)
-        .get('/api/v1/pods')
+        .get('/api/v1/namespaces/default/pods')
         .times(10)
         .reply(200, {
           items: [{
@@ -424,7 +424,7 @@ describe('KubelessDeploy', () => {
       const funcSpec = defaultFuncSpec();
       // First call, fails to retrieve status
       nock(config.clusters[0].cluster.server)
-        .get('/api/v1/pods')
+        .get('/api/v1/namespaces/default/pods')
         .replyWithError('etcdserver: request timed out');
       // Second call, ready:
       mocks.createDeploymentNocks(config.clusters[0].cluster.server, functionName, funcSpec);
@@ -439,7 +439,7 @@ describe('KubelessDeploy', () => {
       // First call, fails to retrieve status
       nock(config.clusters[0].cluster.server)
         .persist()
-        .get('/api/v1/pods')
+        .get('/api/v1/namespaces/default/pods')
         .reply(200, { items: [] });
       // Second call, ready:
       mocks.createDeploymentNocks(config.clusters[0].cluster.server, functionName, funcSpec);
@@ -1311,7 +1311,7 @@ describe('KubelessDeploy', () => {
       };
       nock(config.clusters[0].cluster.server)
         .persist()
-        .get('/api/v1/pods')
+        .get('/api/v1/namespaces/default/pods')
         .reply(200, () => ({
           items: [
             {

diff --git a/test/kubelessInfo.test.js b/test/kubelessInfo.test.js
@@ -84,32 +84,35 @@ describe('KubelessInfo', () => {
     });
   });
   function mockGetCalls(config, functions, functionModif) {
-    nock(config.clusters[0].cluster.server)
-      .get('/api/v1/services')
-      .reply(200, {
-        items: _.map(functions, (f) => ({
-          metadata:
-          {
-            name: f.id,
-            namespace: f.namespace,
-            selfLink: `/api/v1/namespaces/${f.namespace}/services/${f.id}`,
-            uid: '010a169d-618c-11e7-9939-080027abf356',
-            resourceVersion: '248',
-            creationTimestamp: '2017-07-05T14:12:39Z',
-            labels: { function: f.id },
-          },
-          spec:
-          {
-            ports: [{ protocol: 'TCP', port: 8080, targetPort: 8080, nodePort: 30817 }],
-            selector: { function: f.id },
-            clusterIP: '10.0.0.177',
-            type: 'NodePort',
-            sessionAffinity: 'None',
-          },
-          status: { loadBalancer: {} },
-        })),
-      })
-      .persist();
+    const namespaces = _.map(functions, f => f.namespace);
+    _.each(namespaces, ns => {
+      nock(config.clusters[0].cluster.server)
+        .get(`/api/v1/namespaces/${ns}/services`)
+        .reply(200, {
+          items: _.map(_.filter(functions, (f) => f.namespace === ns), (f) => ({
+            metadata:
+            {
+              name: f.id,
+              namespace: f.namespace,
+              selfLink: `/api/v1/namespaces/${f.namespace}/services/${f.id}`,
+              uid: '010a169d-618c-11e7-9939-080027abf356',
+              resourceVersion: '248',
+              creationTimestamp: '2017-07-05T14:12:39Z',
+              labels: { function: f.id },
+            },
+            spec:
+            {
+              ports: [{ protocol: 'TCP', port: 8080, targetPort: 8080, nodePort: 30817 }],
+              selector: { function: f.id },
+              clusterIP: '10.0.0.177',
+              type: 'NodePort',
+              sessionAffinity: 'None',
+            },
+            status: { loadBalancer: {} },
+          })),
+        })
+        .persist();
+    });
 
     // Mock call to get.functions per namespace
     const allFunctions = _.map(functions, (f) => (_.defaultsDeep({}, functionModif, {
@@ -192,7 +195,10 @@ describe('KubelessInfo', () => {
       nock.cleanAll();
     });
     it('should return logs with the correct formating', () => {
-      mockGetCalls(config, [{ id: func, namespace: 'default' }]);
+      mockGetCalls(config, [
+        { id: func, namespace: 'default' },
+        { id: 'my-function-1', namespace: 'custom-1' },
+      ]);
       const kubelessInfo = new KubelessInfo(serverless, { function: func });
       return expect(kubelessInfo.infoFunction({ color: false })).to.become(
         infoMock(func)
@@ -242,7 +248,7 @@ describe('KubelessInfo', () => {
       });
     });
     it('should return an error message if no function is found', (done) => {
-      mockGetCalls(config, []);
+      mockGetCalls(config, [{ id: 'other-function', namespace: 'custom-1' }]);
       nock(config.clusters[0].cluster.server)
         .get('/apis/kubeless.io/v1beta1/namespaces/custom-1/functions/my-function-1')
         .reply(404, { code: 404 });

diff --git a/test/kubelessInvoke.test.js b/test/kubelessInvoke.test.js
@@ -35,7 +35,7 @@ require('chai').use(chaiAsPromised);
 
 function nocksvc(url, funcs) {
   nock(url)
-    .get('/api/v1/services')
+    .get('/api/v1/namespaces/default/services')
     .reply(200, {
       items: _.map(_.flatten([funcs]), f => ({
         metadata:

diff --git a/test/lib/mocks.js b/test/lib/mocks.js
@@ -141,7 +141,7 @@ function createDeploymentNocks(endpoint, func, funcSpec, options) {
     .reply(200, opts.postReply);
   nock(endpoint)
     .persist()
-    .get('/api/v1/pods')
+    .get(`/api/v1/namespaces/${opts.namespace}/pods`)
     .reply(200, JSON.stringify({
       items: [{
         metadata: {