waitForDeployment should also waits for service presence (#213)

Author: faxioman

lib/deploy.js

@@ -212,7 +212,7 @@ function waitForDeployment(funcName, requestMoment, namespace, options) {
   let previousPodStatus = '';
   return new BbPromise((resolve, reject) => {
     const loop = setInterval(() => {
-      if (retries > 3) {
+      if (retries > 10) {
         opts.log(
           `Giving up, unable to retrieve the status of the ${funcName} deployment. `
         );
@@ -257,10 +257,35 @@ function waitForDeployment(funcName, requestMoment, namespace, options) {
               // The pods may be running for a short time
               // so we should ensure that they are stable
               successfulCount++;
-              if (successfulCount === 2) {
-                opts.log(`Function ${funcName} successfully deployed`);
-                clearInterval(loop);
-                resolve();
+              if (successfulCount >= 2) {
+                // The pod is running successfully. Check if the function service is ready
+                core.ns.services.get((svcErr, svcsInfo) => {
+                  if (svcErr) {
+                    if (svcErr.message.match(/request timed out/)) {
+                      opts.log('Request timed out. Retrying...');
+                    } else {
+                      throw svcErr;
+                    }
+                  } else {
+                    // Get the svc for current function
+                    const functionSvcs = _.filter(
+                      svcsInfo.items,
+                      (svc) => (
+                        !_.isEmpty(svc.metadata.labels) &&
+                        svc.metadata.labels.function === funcName &&
+                        !svc.metadata.deletionTimestamp
+                      )
+                    );
+                    if (_.isEmpty(functionSvcs)) {
+                      retries++;
+                      opts.log(`Unable to find internal service for ${funcName}. Retrying...`);
+                    } else {
+                      opts.log(`Function ${funcName} successfully deployed`);
+                      clearInterval(loop);
+                      resolve();
+                    }
+                  }
+                });
               }
             } else if (opts.verbose) {
               successfulCount = 0;

package.json

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

test/kubelessDeploy.test.js

@@ -1448,6 +1448,28 @@ describe('KubelessDeploy', () => {
               },
             }],
         }));
+      nock(config.clusters[0].cluster.server)
+        .persist()
+        .get('/api/v1/namespaces/default/services')
+        .reply(200, () => ({
+          items: [
+            {
+              metadata: {
+                name: 'myFunction3',
+                labels: { function: 'myFunction3' },
+                annotations: {},
+                creationTimestamp: moment().add('60', 's'),
+              },
+            },
+            {
+              metadata: {
+                name: functionName,
+                labels: { function: functionName },
+                annotations: {},
+                creationTimestamp: moment().add('60', 's'),
+              },
+            }],
+        }));
 
       // Call for myFunction1
       mocks.createDeploymentNocks(config.clusters[0].cluster.server, functionName, funcSpec, {

test/lib/mocks.js

@@ -138,6 +138,19 @@ function createDeploymentNocks(endpoint, func, funcSpec, options) {
         },
       }],
     }));
+  nock(endpoint)
+    .persist()
+    .get(`/api/v1/namespaces/${opts.namespace}/services`)
+    .reply(200, JSON.stringify({
+      items: [{
+        metadata: {
+          name: func,
+          labels: { function: func },
+          annotations: {},
+          creationTimestamp: moment().add('60', 's'),
+        },
+      }],
+    }));
 }
 
 function createTriggerNocks(endpoint, func, hostname, p, options) {