Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
holmes
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
holmes
Commits
8a8219e8
Commit
8a8219e8
authored
May 21, 2022
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改下日志
parent
4f7c3afe
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
K8sController.java
src/main/java/cn/qg/holmes/controller/k8s/K8sController.java
+6
-2
No files found.
src/main/java/cn/qg/holmes/controller/k8s/K8sController.java
View file @
8a8219e8
...
@@ -9,6 +9,7 @@ import cn.qg.holmes.service.auth.TokenService;
...
@@ -9,6 +9,7 @@ import cn.qg.holmes.service.auth.TokenService;
import
cn.qg.holmes.service.k8s.*
;
import
cn.qg.holmes.service.k8s.*
;
import
cn.qg.holmes.utils.MongoUtils
;
import
cn.qg.holmes.utils.MongoUtils
;
import
cn.qg.holmes.utils.RedisUtils
;
import
cn.qg.holmes.utils.RedisUtils
;
import
cn.qg.holmes.utils.YamlUtils
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.tencentcloudapi.tcr.v20190924.models.RepoInfo
;
import
com.tencentcloudapi.tcr.v20190924.models.RepoInfo
;
...
@@ -121,9 +122,10 @@ public class K8sController {
...
@@ -121,9 +122,10 @@ public class K8sController {
tkeService
.
createIngressByYaml
(
serviceCreateVo
);
tkeService
.
createIngressByYaml
(
serviceCreateVo
);
}
}
// 新增Service
// 新增Service
tkeService
.
createServiceByYaml
(
serviceCreateVo
);
Service
service
=
tkeService
.
createServiceByYaml
(
serviceCreateVo
);
// 休眠3秒,防止创建服务的时候获取不到Service暴露的端口
// 休眠3秒,防止创建服务的时候获取不到Service暴露的端口
Thread
.
sleep
(
5000
);
Thread
.
sleep
(
5000
);
log
.
info
(
"/service/create创建Deployment前,Service状态:{}"
,
YamlUtils
.
JsonToYamlStr
(
JSON
.
toJSONString
(
service
)));
// 新增Deployment
// 新增Deployment
tkeService
.
createDeploymentByYaml
(
serviceCreateVo
);
tkeService
.
createDeploymentByYaml
(
serviceCreateVo
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -184,7 +186,7 @@ public class K8sController {
...
@@ -184,7 +186,7 @@ public class K8sController {
Service
service
=
tkeService
.
getServiceDetail
(
namespace
,
serviceName
);
Service
service
=
tkeService
.
getServiceDetail
(
namespace
,
serviceName
);
if
(
service
==
null
)
{
if
(
service
==
null
)
{
// 创建或替换Service
// 创建或替换Service
tkeService
.
createServiceByYaml
(
serviceCreateVo
);
service
=
tkeService
.
createServiceByYaml
(
serviceCreateVo
);
}
}
// 休眠5秒,防止服务启动时获取不到Service暴露出来的端口
// 休眠5秒,防止服务启动时获取不到Service暴露出来的端口
...
@@ -193,6 +195,8 @@ public class K8sController {
...
@@ -193,6 +195,8 @@ public class K8sController {
}
catch
(
InterruptedException
e
)
{
}
catch
(
InterruptedException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
log
.
info
(
"/service/modify创建Deployment前,Service状态:{}"
,
YamlUtils
.
JsonToYamlStr
(
JSON
.
toJSONString
(
service
)));
// 创建或替换Deployment
// 创建或替换Deployment
tkeService
.
createDeploymentByYaml
(
serviceCreateVo
);
tkeService
.
createDeploymentByYaml
(
serviceCreateVo
);
// 创建或替换Ingress
// 创建或替换Ingress
...
...
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