Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
tke-eos
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QA
tke-eos
Commits
f65ec19f
Commit
f65ec19f
authored
Jun 24, 2019
by
kewei.jia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加多个mysql服务后 查看详细信息报错,已修改
parent
d4d47c7d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
service.js
app/service.js
+2
-1
service.js
kubeService/service.js
+3
-2
No files found.
app/service.js
View file @
f65ec19f
...
@@ -60,9 +60,10 @@ router.post('/details', async (ctx) => {
...
@@ -60,9 +60,10 @@ router.post('/details', async (ctx) => {
ctx
.
validate
(
ctx
.
Joi
.
object
().
keys
({
ctx
.
validate
(
ctx
.
Joi
.
object
().
keys
({
serviceName
:
ctx
.
Joi
.
string
().
required
(),
serviceName
:
ctx
.
Joi
.
string
().
required
(),
namespace
:
ctx
.
Joi
.
string
().
required
(),
namespace
:
ctx
.
Joi
.
string
().
required
(),
type
:
ctx
.
Joi
.
string
().
required
(),
}))
}))
const
data
=
await
getServiceDetail
(
ctx
.
request
.
body
.
namespace
,
ctx
.
request
.
body
.
serviceName
)
const
data
=
await
getServiceDetail
(
ctx
.
request
.
body
.
namespace
,
ctx
.
request
.
body
.
serviceName
,
ctx
.
request
.
body
.
type
)
ctx
.
body
=
ctx
.
ok
(
data
)
ctx
.
body
=
ctx
.
ok
(
data
)
})
})
...
...
kubeService/service.js
View file @
f65ec19f
...
@@ -201,7 +201,7 @@ const getServicesFormat = async (namespace) => {
...
@@ -201,7 +201,7 @@ const getServicesFormat = async (namespace) => {
return
ret
return
ret
}
}
const
getServiceDetail
=
async
(
namespace
,
name
)
=>
{
const
getServiceDetail
=
async
(
namespace
,
name
,
type
)
=>
{
const
res
=
await
Promise
.
all
([
const
res
=
await
Promise
.
all
([
client
.
api
.
v1
.
namespaces
(
namespace
).
pods
.
get
({
qs
:
{
labelSelector
:
`qcloud-app=
${
name
}
`
}
}),
client
.
api
.
v1
.
namespaces
(
namespace
).
pods
.
get
({
qs
:
{
labelSelector
:
`qcloud-app=
${
name
}
`
}
}),
client
.
api
.
v1
.
namespaces
(
namespace
).
services
(
name
).
get
(),
client
.
api
.
v1
.
namespaces
(
namespace
).
services
(
name
).
get
(),
...
@@ -210,7 +210,8 @@ const getServiceDetail = async (namespace, name) => {
...
@@ -210,7 +210,8 @@ const getServiceDetail = async (namespace, name) => {
res
[
0
]
=
formatPodInfo
(
res
[
0
].
body
.
items
[
0
])
res
[
0
]
=
formatPodInfo
(
res
[
0
].
body
.
items
[
0
])
res
[
1
]
=
formatServiceInfo
(
res
[
1
].
body
)
res
[
1
]
=
formatServiceInfo
(
res
[
1
].
body
)
if
(
!
dict
.
commonService
.
includes
(
name
))
{
// if (!dict.commonService.includes(name)) {
if
(
type
!==
'
base
'
)
{
res
[
2
]
=
await
client
.
apis
.
extensions
.
v1beta1
.
namespaces
(
namespace
).
ingresses
(
name
).
get
()
res
[
2
]
=
await
client
.
apis
.
extensions
.
v1beta1
.
namespaces
(
namespace
).
ingresses
(
name
).
get
()
res
[
2
]
=
formatIngressInfo
(
res
[
2
].
body
)
res
[
2
]
=
formatIngressInfo
(
res
[
2
].
body
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment