Commit e7a773fe authored by 智勇's avatar 智勇

更新部署增加await

parent 8ce834c6
...@@ -158,7 +158,7 @@ router.post('/modifyDeploy', async (ctx) => { ...@@ -158,7 +158,7 @@ router.post('/modifyDeploy', async (ctx) => {
if (!data.label) { if (!data.label) {
data.label = data.type data.label = data.type
} }
const resources = makeResouce(data.serviceName, data.label) const resources = await makeResouce(data.serviceName, data.label)
data.resources = resources data.resources = resources
await deployUpdate(ctx.cluterParams, ctx.client, data) await deployUpdate(ctx.cluterParams, ctx.client, data)
// await deployUpdate(ctx.cluster, ctx.client, data) // await deployUpdate(ctx.cluster, ctx.client, data)
......
const logger = require('koa-log4').getLogger() const logger = require('koa-log4').getLogger('ingressHandle')
const getManifest = (namespace, servicename, doamin, clusterDomain) => ({ const getManifest = (namespace, servicename, doamin, clusterDomain) => ({
apiVersion: 'extensions/v1beta1', apiVersion: 'extensions/v1beta1',
...@@ -46,8 +46,12 @@ const ingressUpdate = async (client, namespace, servicename, host, clusterDomain ...@@ -46,8 +46,12 @@ const ingressUpdate = async (client, namespace, servicename, host, clusterDomain
.patch({ body: Manifest }) .patch({ body: Manifest })
} }
const ingressDelete = async (client, namespace, servicename) => { const ingressDelete = async (client, namespace, servicename) => {
logger.info('删除ingress', namespace, servicename) try {
await client.apis.extensions.v1beta1.namespaces(namespace).ingresses(servicename).delete() logger.info('删除ingress', namespace, servicename)
await client.apis.extensions.v1beta1.namespaces(namespace).ingresses(servicename).delete()
} catch (error) {
logger.warn(error.toString())
}
} }
module.exports = { module.exports = {
ingressGet, ingressGet,
......
...@@ -2,7 +2,7 @@ const _ = require('lodash') ...@@ -2,7 +2,7 @@ const _ = require('lodash')
const moment = require('moment') const moment = require('moment')
const yaml = require('js-yaml') const yaml = require('js-yaml')
const logger = require('koa-log4') const logger = require('koa-log4')
.getLogger('kubeService') .getLogger('kubeServiceHandle')
const yamls = require('../yamls') const yamls = require('../yamls')
const APP_CONFIG = require('../config') const APP_CONFIG = require('../config')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment