Commit 521350a7 authored by 智勇's avatar 智勇

过滤掉tagName中包含Code的记录

parent 131a1b3b
...@@ -13,7 +13,7 @@ module.exports = router ...@@ -13,7 +13,7 @@ module.exports = router
router.get('/', async (ctx) => { router.get('/', async (ctx) => {
// 取节点列表的第一个作为服务的访问ip // 取节点列表的第一个作为服务的访问ip
const cacheKey = 'k8s.nodes.first' const cacheKey = 'k8s.nodes.first'
let c = lruCache.get(cacheKey) const c = lruCache.get(cacheKey)
let wanIp = lruCache.get(cacheKey) let wanIp = lruCache.get(cacheKey)
if (!c) { if (!c) {
const res = await ctx.cluster.node_list() const res = await ctx.cluster.node_list()
...@@ -23,13 +23,12 @@ router.get('/', async (ctx) => { ...@@ -23,13 +23,12 @@ 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) const resData = await ctx.cluster.service_get(item.serviceName, ctx.query.namespace)
item.image = resData.service.containers[0].image item.image = resData.service.containers[0].image
if (item.userLabels.type === 'base') { if (item.userLabels.type === 'base') {
item.portMappings = resData.service.portMappings item.portMappings = resData.service.portMappings
item.wanIp = wanIp item.wanIp = wanIp
} }
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) {
...@@ -78,8 +77,8 @@ router.post('/details', async (ctx) => { ...@@ -78,8 +77,8 @@ router.post('/details', async (ctx) => {
ctx.body = ctx.ok(data) ctx.body = ctx.ok(data)
}) })
router.post('/delete', async (ctx) => { router.post('/delete', async (ctx) => {
await ingressDelete(ctx.request.body.namespace, ctx.request.body.serviceName)
await ctx.cluster.service_delete(ctx.request.body.serviceName, ctx.request.body.namespace) await ctx.cluster.service_delete(ctx.request.body.serviceName, ctx.request.body.namespace)
await ingressDelete(ctx.request.body.namespace, ctx.request.body.serviceName)
ctx.body = ctx.ok('删除成功') ctx.body = ctx.ok('删除成功')
}) })
......
...@@ -4,5 +4,12 @@ const router = new Router() ...@@ -4,5 +4,12 @@ const router = new Router()
module.exports = router module.exports = router
router.post('/', async (ctx) => { router.post('/', async (ctx) => {
const data = await ctx.container.tag_get(ctx.request.body.reponame) const data = await ctx.container.tag_get(ctx.request.body.reponame)
// 过滤掉tagName中包含Code的记录
data.tagInfo = data.tagInfo.filter((item) => {
if (item.tagName.indexOf('Code') === -1) {
return item
}
return null
})
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