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
9cedf094
Commit
9cedf094
authored
Sep 06, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化/k8s/service/modify接口
parent
964528a3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
K8sController.java
src/main/java/cn/qg/holmes/controller/k8s/K8sController.java
+8
-0
K8sService.java
src/main/java/cn/qg/holmes/service/k8s/K8sService.java
+6
-5
No files found.
src/main/java/cn/qg/holmes/controller/k8s/K8sController.java
View file @
9cedf094
...
@@ -210,6 +210,14 @@ public class K8sController {
...
@@ -210,6 +210,14 @@ public class K8sController {
String
type
=
serviceCreateVo
.
getType
();
String
type
=
serviceCreateVo
.
getType
();
String
label
=
serviceCreateVo
.
getLabel
();
String
label
=
serviceCreateVo
.
getLabel
();
String
namespace
=
serviceCreateVo
.
getNamespace
();
String
namespace
=
serviceCreateVo
.
getNamespace
();
// 默认mock为0
if
(
serviceCreateVo
.
getMock
()
==
null
)
{
serviceCreateVo
.
setMock
(
0
);
}
// 默认设置debug为0
if
(
serviceCreateVo
.
getDebug
()
==
null
)
{
serviceCreateVo
.
setDebug
(
0
);
}
QueryWrapper
<
DockerProject
>
queryWrapper
=
new
QueryWrapper
<>();
QueryWrapper
<
DockerProject
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"project_name"
,
serviceName
);
queryWrapper
.
eq
(
"project_name"
,
serviceName
);
if
(
label
.
equals
(
"java"
))
{
if
(
label
.
equals
(
"java"
))
{
...
...
src/main/java/cn/qg/holmes/service/k8s/K8sService.java
View file @
9cedf094
...
@@ -711,7 +711,7 @@ public class K8sService {
...
@@ -711,7 +711,7 @@ public class K8sService {
deployment
.
setMetadata
(
objectMeta
);
deployment
.
setMetadata
(
objectMeta
);
deployment
.
setSpec
(
deploymentSpec
);
deployment
.
setSpec
(
deploymentSpec
);
log
.
info
(
"开始创建Java Deployment:{}"
,
deployment
.
toString
(
));
log
.
info
(
"开始创建Java Deployment:{}"
,
JSON
.
toJSONString
(
deployment
));
return
kubernetesClient
.
apps
().
deployments
().
inNamespace
(
namespace
).
create
(
deployment
);
return
kubernetesClient
.
apps
().
deployments
().
inNamespace
(
namespace
).
create
(
deployment
);
}
}
...
@@ -932,14 +932,14 @@ public class K8sService {
...
@@ -932,14 +932,14 @@ public class K8sService {
deployment
.
setMetadata
(
objectMeta
);
deployment
.
setMetadata
(
objectMeta
);
deployment
.
setSpec
(
deploymentSpec
);
deployment
.
setSpec
(
deploymentSpec
);
log
.
info
(
"开始创建ui/node Deployment:{}"
,
deployment
.
toString
(
));
log
.
info
(
"开始创建ui/node Deployment:{}"
,
JSON
.
toJSONString
(
deployment
));
return
kubernetesClient
.
apps
().
deployments
().
inNamespace
(
namespace
).
create
(
deployment
);
return
kubernetesClient
.
apps
().
deployments
().
inNamespace
(
namespace
).
create
(
deployment
);
}
}
public
PersistentVolumeClaim
createRedisPvc
(
String
namespace
)
{
public
PersistentVolumeClaim
createRedisPvc
(
String
namespace
)
{
PersistentVolumeClaim
redisPvc
=
new
PersistentVolumeClaim
();
PersistentVolumeClaim
redisPvc
=
new
PersistentVolumeClaim
();
log
.
info
(
"开始创建redis pvc:{}"
,
redisPvc
.
toString
(
));
log
.
info
(
"开始创建redis pvc:{}"
,
JSON
.
toJSONString
(
redisPvc
));
return
kubernetesClient
.
persistentVolumeClaims
().
inNamespace
(
namespace
).
create
(
redisPvc
);
return
kubernetesClient
.
persistentVolumeClaims
().
inNamespace
(
namespace
).
create
(
redisPvc
);
}
}
...
@@ -986,7 +986,7 @@ public class K8sService {
...
@@ -986,7 +986,7 @@ public class K8sService {
redisService
.
setMetadata
(
objectMeta
);
redisService
.
setMetadata
(
objectMeta
);
redisService
.
setSpec
(
serviceSpec
);
redisService
.
setSpec
(
serviceSpec
);
log
.
info
(
"开始创建redis Service: {}"
,
redisService
.
toString
(
));
log
.
info
(
"开始创建redis Service: {}"
,
JSON
.
toJSONString
(
redisService
));
return
kubernetesClient
.
services
().
inNamespace
(
namespace
).
create
(
redisService
);
return
kubernetesClient
.
services
().
inNamespace
(
namespace
).
create
(
redisService
);
}
}
...
@@ -1134,7 +1134,7 @@ public class K8sService {
...
@@ -1134,7 +1134,7 @@ public class K8sService {
redisDeployment
.
setSpec
(
deploymentSpec
);
redisDeployment
.
setSpec
(
deploymentSpec
);
redisDeployment
.
setStatus
(
deploymentStatus
);
redisDeployment
.
setStatus
(
deploymentStatus
);
log
.
info
(
"创建redis Deployment:{}"
,
redisDeployment
);
log
.
info
(
"创建redis Deployment:{}"
,
JSON
.
toJSONString
(
redisDeployment
)
);
return
kubernetesClient
.
apps
().
deployments
().
inNamespace
(
namespace
).
create
(
redisDeployment
);
return
kubernetesClient
.
apps
().
deployments
().
inNamespace
(
namespace
).
create
(
redisDeployment
);
}
}
...
@@ -2195,6 +2195,7 @@ public class K8sService {
...
@@ -2195,6 +2195,7 @@ public class K8sService {
namespace
.
setMetadata
(
objectMeta
);
namespace
.
setMetadata
(
objectMeta
);
namespace
.
setSpec
(
namespaceSpec
);
namespace
.
setSpec
(
namespaceSpec
);
namespace
.
setStatus
(
namespaceStatus
);
namespace
.
setStatus
(
namespaceStatus
);
log
.
info
(
"创建新的环境: {}"
,
JSON
.
toJSONString
(
namespace
));
return
kubernetesClient
.
namespaces
().
create
(
namespace
);
return
kubernetesClient
.
namespaces
().
create
(
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