Commit 131a1b3b authored by 薛智杰's avatar 薛智杰

Merge branch 'tag' into 'master'

非base服务增加tag



See merge request !14
parents 6db94cea 3bbf7302
...@@ -24,16 +24,16 @@ router.get('/', async (ctx) => { ...@@ -24,16 +24,16 @@ router.get('/', async (ctx) => {
const data = await ctx.cluster.service_list(ctx.query.namespace) const data = await ctx.cluster.service_list(ctx.query.namespace)
const getDetail = async (item) => { const getDetail = async (item) => {
let resData = await ctx.cluster.service_get(item.serviceName, ctx.query.namespace) let resData = await ctx.cluster.service_get(item.serviceName, ctx.query.namespace)
item.portMappings = resData.service.portMappings
item.image = resData.service.containers[0].image item.image = resData.service.containers[0].image
item.wanIp = wanIp if (item.userLabels.type === 'base') {
item.portMappings = resData.service.portMappings
item.wanIp = wanIp
}
return return
} }
const task = [] const task = []
for (let i = 0; i < data.services.length; i += 1) { for (let i = 0; i < data.services.length; i += 1) {
if (data.services[i].userLabels.type === 'base') { task.push(getDetail(data.services[i]))
task.push(getDetail(data.services[i]))
}
} }
await Promise.all(task) await Promise.all(task)
ctx.body = ctx.ok(data) ctx.body = ctx.ok(data)
......
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