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
94957db2
Commit
94957db2
authored
Aug 23, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增
parent
cde64549
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
1 deletion
+39
-1
K8sController.java
src/main/java/cn/qg/holmes/controller/k8s/K8sController.java
+39
-1
No files found.
src/main/java/cn/qg/holmes/controller/k8s/K8sController.java
View file @
94957db2
...
...
@@ -5,6 +5,7 @@ import cn.qg.holmes.entity.k8s.DockerProject;
import
cn.qg.holmes.entity.k8s.ServiceCreateVo
;
import
cn.qg.holmes.service.k8s.*
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
io.fabric8.kubernetes.api.model.apps.Deployment
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -187,7 +188,8 @@ public class K8sController {
}
/**
* 实际上是更新pod
* 废弃
* 修改pod
* @param namespace 环境
* @param serviceName 服务名
* @param image 镜像名
...
...
@@ -198,6 +200,42 @@ public class K8sController {
return
JsonResult
.
buildSuccessResult
(
k8sService
.
updateDeployment
(
namespace
,
serviceName
,
image
));
}
/**
* 更新pod
* @param serviceCreateVo
* @return
*/
@PostMapping
(
"/service/update"
)
public
JsonResult
updatePod
(
@RequestBody
ServiceCreateVo
serviceCreateVo
)
{
String
namespace
=
serviceCreateVo
.
getNamespace
();
String
serviceName
=
serviceCreateVo
.
getServiceName
();
String
label
=
serviceCreateVo
.
getLabel
();
String
type
=
serviceCreateVo
.
getType
();
// 获取dockerProject
QueryWrapper
<
DockerProject
>
dockerProjectQueryWrapper
=
new
QueryWrapper
<>();
dockerProjectQueryWrapper
.
eq
(
"project_name"
,
serviceName
)
.
eq
(
"project_type"
,
type
);
DockerProject
dockerProject
=
dockerProjectService
.
getOne
(
dockerProjectQueryWrapper
);
// 先删除原有pod
if
(!
k8sService
.
deleteDeployment
(
namespace
,
serviceName
))
{
return
JsonResult
.
buildErrorStateResult
(
"更新服务失败!"
,
false
);
}
// 再创建新pod
Deployment
deployment
=
null
;
if
(
label
.
equals
(
"java"
))
{
deployment
=
k8sService
.
createJavaDeployment
(
serviceCreateVo
,
dockerProject
);
}
if
(
label
.
equals
(
"ui"
)
||
label
.
equals
(
"node"
))
{
deployment
=
k8sService
.
createUIAndNodeDeployment
(
serviceCreateVo
,
dockerProject
);
}
if
(
deployment
!=
null
)
{
return
JsonResult
.
buildSuccessResult
(
"更新成功!"
);
}
else
{
return
JsonResult
.
buildErrorStateResult
(
"更新失败"
,
false
);
}
}
/**
* 删除pod
* @param namespace 环境
...
...
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