Merge branch 'restartSchedule' into 'master'

优化重启



See merge request !31

app/restartLatest.js

@@ -4,7 +4,7 @@ const sleep = require('sleep')
 const logger = require('koa-log4').getLogger('deployLatest')
 const cluster = require('../services/tke.clusterService').create()
 const container = require('../services/tke.containerService').create()
-const { getServiceDetail, serviceRestart, getServicesFormat } = require('../kubeService/service')
+const { serviceRestart, getServicesFormat } = require('../kubeService/service')
 
 const keepNamespace = ['default', 'kube-system']
 const repoNS = ['qa-java', 'qa-ui', 'qa-node', 'qa-python']
@@ -17,7 +17,6 @@ const deploy = async () => {
     for (const repo of repoNSData.repoInfo) {
       logger.info('开始检查仓库项目:', repo.reponame)
       const repoName = repo.reponame.split('/')[1]
-      const repoType = repo.reponame.split('/')[0].split('-')[1]
       const latest = await container.getTagByName(repo.reponame, 'latest')
       const latestImageID = _.get(latest.tagInfo, '[0].tagId', '')
       let ns = await cluster.namespace_get()
@@ -26,10 +25,9 @@ const deploy = async () => {
         const svcs = await getServicesFormat(namespace.name)
         for (const svc of svcs) {
           if (svc.serviceName === repoName && svc.image.indexOf('latest') !== -1) {
-            const data = await getServiceDetail(namespace.name, repoName, repoType)
-            if (latestImageID !== data.imageID.split('@')[1]) {
-              logger.info('部署项目', namespace.name, data.podName)
-              await serviceRestart(namespace.name, data.podName)
+            if (latestImageID !== svc.imageID.split('@')[1]) {
+              logger.info('部署项目', namespace.name, svc.podName)
+              await serviceRestart(namespace.name, svc.podName)
               sleep.msleep(500)
             }
           }
@@ -42,6 +40,7 @@ const deploy = async () => {
 }
 
 module.exports = () => {
+  // schedule.scheduleJob('*/2 * * * *', async () => {
   schedule.scheduleJob('0 2 * * *', async () => {
     try {
       await deploy()

app/service.js

@@ -83,7 +83,7 @@ router.post('/delete', async (ctx) => {
   if (serviceName === 'xyqb-user2') {
     await ingressDelete(namespace, 'xyqb-user2-2')
   }
-  ctx.body = ctx.ok('删除成功')
+  ctx.body = ctx.ok(`删除${serviceName}成功`)
 })
 
 router.post('/modifyImage', async (ctx) => {

yamls/ui.node.yaml

@@ -63,9 +63,9 @@ spec:
           exec:
             command:
               - /home/quant_group/readyCheck.sh
-          initialDelaySeconds: 5
+          initialDelaySeconds: 2
           timeoutSeconds: 2
-          periodSeconds: 5
+          periodSeconds: 1
           successThreshold: 1
           failureThreshold: 40
       restartPolicy: Always