精简通知内容

app/dailySyncDB.js

 const schedule = require('node-schedule')
-const sleep = require('sleep')
 const logger = require('koa-log4').getLogger('dailySyncDB')
 const {
   getServicesFormat, getAllNamespace,
 } = require('../kubeService/service')
 const getClient = require('../resource/getClient')
 const awaitRequest = require('../utils/awaitRequest')
+const sleep = require('../utils/sleep')
 const APP_CONFIG = require('../config')
 
 const syncDB = async (cluster) => {
@@ -40,7 +40,7 @@ const syncDB = async (cluster) => {
         } else {
           logger.info('同步ns失败:', namespace.name, res.data)
         }
-        sleep.msleep(2 * 1000)
+        await sleep(60 * 1000)
         break
       }
     }

app/restartLatest.js

 const schedule = require('node-schedule')
 const _ = require('lodash')
-const sleep = require('sleep')
 const logger = require('koa-log4').getLogger('deployLatest')
 const {
   serviceRestart, getServicesFormat, getAllNamespace, deployUpdate,
@@ -8,6 +7,7 @@ const {
 const container = require('../services/tke.containerService').create()
 const getClient = require('../resource/getClient')
 const dingTalk = require('../utils/dingTalk')
+const sleep = require('../utils/sleep')
 const makeResouce = require('./../resource/makeResouce')
 
 const address = 'https://oapi.dingtalk.com/robot/send?access_token=99e801a2cf26680e6ce09cb12f830c21a03ae3df07d18f6a38e1db54c0e95f2c'
@@ -16,16 +16,17 @@ const deploy = async (cluster) => {
   logger.info('deployLatest start')
   const client = await getClient(cluster)
   const ns = await getAllNamespace(client.clientInfo)
-
+  const summary = {}
   // // for test
-  // const testNamespace = ['ka3']
+  // const testNamespace = ['ka3', 'xjfq']
   // const nsTest = ns.namespaces && ns.namespaces.filter(item => testNamespace.includes(item.name))
   // for (const namespace of nsTest) {
   for (const namespace of ns.namespaces) {
     logger.info('开始检查ns:', namespace.name)
-    const latestArray = []
-    const masterArray = []
-
+    summary[namespace.name] = {
+      latestArray: [],
+      masterArray: [],
+    }
     const svcs = await getServicesFormat(client.clientInfo, namespace.name)
     for (const svc of svcs) {
       // 重启latest
@@ -36,10 +37,10 @@ const deploy = async (cluster) => {
         const latestImageID = _.get(latest.tagInfo, '[0].tagId', '')
         if (svc.imageID.split('@')[1] !== latestImageID) {
           logger.info('latest不一致，部署项目', namespace.name, svc.podName)
-          latestArray.push(svc.image.split('/')[2])
+          summary[namespace.name].latestArray.push(svc.serviceName)
           await serviceRestart(client.clientInfo, namespace.name, svc.podName)
         }
-        sleep.msleep(5 * 1000)
+        await sleep(5 * 1000)
       }
       // 把master更新部署成lastet
       if (~svc.image.search(':master-')) {
@@ -60,16 +61,22 @@ const deploy = async (cluster) => {
         const resources = await makeResouce(data.serviceName, data.label)
         data.resources = resources
         await deployUpdate(client.clusterInfo, client.clientInfo, data)
-        masterArray.push(svc.image.split('/')[2])
-        sleep.msleep(5 * 1000)
+        summary[namespace.name].masterArray.push(svc.serviceName)
+        await sleep(5 * 1000)
       }
     }
-    const text = `namespace : ${namespace.name}\n\n`
-      + `重新部署的latest : \n\n${latestArray.join('\n\n')}\n\n`
-      + `重新部署的master : \n\n${masterArray.join('\n\n')}`
-    dingTalk(`${namespace.name} latest 部署结果`, text, address)
+
     logger.info('ns:', namespace.name, '检查完毕')
   }
+  let text = ''
+  for (const i in summary) {
+    if (Object.prototype.hasOwnProperty.call(summary, i)) {
+      text = `${text}${i}重新部署的latest : ${summary[i].latestArray.join('、')}\n\n`
+        + `${i}重新部署的master : ${summary[i].masterArray.join('、')} \n\n`
+        + ' \n\n'
+    }
+  }
+  dingTalk('daily latest 部署结果', text, address)
   logger.info('deployLatest end')
 }
 

utils/sleep.js

+module.exports = (time = 0) => new Promise((resolve) => {
+  setTimeout(() => {
+    resolve();
+  }, time);
+});