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
baf7edbd
Commit
baf7edbd
authored
Sep 10, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
921b78ce
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
K8sController.java
src/main/java/cn/qg/holmes/controller/k8s/K8sController.java
+5
-0
K8sService.java
src/main/java/cn/qg/holmes/service/k8s/K8sService.java
+5
-2
No files found.
src/main/java/cn/qg/holmes/controller/k8s/K8sController.java
View file @
baf7edbd
...
@@ -245,6 +245,7 @@ public class K8sController {
...
@@ -245,6 +245,7 @@ public class K8sController {
DockerProject
dockerProject
=
dockerProjectService
.
getOne
(
queryWrapper
);
DockerProject
dockerProject
=
dockerProjectService
.
getOne
(
queryWrapper
);
// 创建Deployment
// 创建Deployment
if
(
k8sService
.
queryIfDeploymentExistByName
(
namespace
,
serviceName
))
{
if
(
k8sService
.
queryIfDeploymentExistByName
(
namespace
,
serviceName
))
{
log
.
info
(
"{}环境{}服务的Deployment已存在,首先删除该Deployment."
,
namespace
,
serviceName
);
k8sService
.
deleteDeployment
(
namespace
,
serviceName
);
k8sService
.
deleteDeployment
(
namespace
,
serviceName
);
}
}
k8sService
.
createJavaDeployment
(
serviceCreateVo
,
dockerProject
);
k8sService
.
createJavaDeployment
(
serviceCreateVo
,
dockerProject
);
...
@@ -262,6 +263,10 @@ public class K8sController {
...
@@ -262,6 +263,10 @@ public class K8sController {
// UI
// UI
DockerProject
dockerProject
=
dockerProjectService
.
getOne
(
queryWrapper
);
DockerProject
dockerProject
=
dockerProjectService
.
getOne
(
queryWrapper
);
// 创建Deployment
// 创建Deployment
if
(
k8sService
.
queryIfDeploymentExistByName
(
namespace
,
serviceName
))
{
log
.
info
(
"{}环境{}服务的Deployment已存在,首先删除该Deployment."
,
namespace
,
serviceName
);
k8sService
.
deleteDeployment
(
namespace
,
serviceName
);
}
k8sService
.
createUIAndNodeDeployment
(
serviceCreateVo
,
dockerProject
);
k8sService
.
createUIAndNodeDeployment
(
serviceCreateVo
,
dockerProject
);
// 如果不存在Service,则重新创建Service
// 如果不存在Service,则重新创建Service
...
...
src/main/java/cn/qg/holmes/service/k8s/K8sService.java
View file @
baf7edbd
...
@@ -121,7 +121,7 @@ public class K8sService {
...
@@ -121,7 +121,7 @@ public class K8sService {
String
NS_PREFIX
=
"k8s:namespace:"
;
String
NS_PREFIX
=
"k8s:namespace:"
;
Object
redisValue
=
redisUtils
.
get
(
NS_PREFIX
+
env
);
Object
redisValue
=
redisUtils
.
get
(
NS_PREFIX
+
env
);
if
(
redisValue
!=
null
)
{
if
(
redisValue
!=
null
)
{
log
.
info
(
"从缓存获取到{}环境namespace列表:{}"
,
env
,
redisValue
);
//
log.info("从缓存获取到{}环境namespace列表:{}", env, redisValue);
return
JSON
.
parseArray
(
redisValue
.
toString
(),
Map
.
class
);
return
JSON
.
parseArray
(
redisValue
.
toString
(),
Map
.
class
);
}
else
{
}
else
{
List
<
Map
>
resultList
=
new
ArrayList
<>();
List
<
Map
>
resultList
=
new
ArrayList
<>();
...
@@ -199,7 +199,7 @@ public class K8sService {
...
@@ -199,7 +199,7 @@ public class K8sService {
resultList
.
add
(
map
);
resultList
.
add
(
map
);
}
}
}
}
log
.
info
(
"获取{}环境namespace列表:{}"
,
env
,
JSON
.
toJSONString
(
resultList
));
//
log.info("获取{}环境namespace列表:{}", env, JSON.toJSONString(resultList));
// 设置缓存
// 设置缓存
redisUtils
.
set
(
NS_PREFIX
+
env
,
JSON
.
toJSONString
(
resultList
),
1800
);
redisUtils
.
set
(
NS_PREFIX
+
env
,
JSON
.
toJSONString
(
resultList
),
1800
);
return
resultList
;
return
resultList
;
...
@@ -2246,5 +2246,8 @@ public class K8sService {
...
@@ -2246,5 +2246,8 @@ public class K8sService {
// k8sService.podTest();
// k8sService.podTest();
// k8sService.getPodList("k8s");
// k8sService.getPodList("k8s");
// System.out.println(JSON.toJSONString(k8sService.getPodListNew("fe")));
// System.out.println(JSON.toJSONString(k8sService.getPodListNew("fe")));
// if (!k8sService.queryIfServiceExistByName("fe", "lxq-ui")) {
// k8sService.createUIAndNodeService("fe", "lxq-ui", "ui", "ui");
// }
}
}
}
}
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