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
e7a773fe
Commit
e7a773fe
authored
Oct 28, 2019
by
智勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新部署增加await
parent
8ce834c6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
service.js
app/service.js
+1
-1
ingress.js
kubeService/ingress.js
+7
-3
service.js
kubeService/service.js
+1
-1
No files found.
app/service.js
View file @
e7a773fe
...
@@ -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)
...
...
kubeService/ingress.js
View file @
e7a773fe
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
,
...
...
kubeService/service.js
View file @
e7a773fe
...
@@ -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
(
'
kubeService
Handle
'
)
const
yamls
=
require
(
'
../yamls
'
)
const
yamls
=
require
(
'
../yamls
'
)
const
APP_CONFIG
=
require
(
'
../config
'
)
const
APP_CONFIG
=
require
(
'
../config
'
)
...
...
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