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
4f7c3afe
Commit
4f7c3afe
authored
May 21, 2022
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改下日志
parent
0f2fe09c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
TkeService.java
src/main/java/cn/qg/holmes/service/k8s/TkeService.java
+2
-2
No files found.
src/main/java/cn/qg/holmes/service/k8s/TkeService.java
View file @
4f7c3afe
...
@@ -672,7 +672,7 @@ public class TkeService {
...
@@ -672,7 +672,7 @@ public class TkeService {
if
(
serviceCreateVo
.
getDebug
()
==
1
)
{
if
(
serviceCreateVo
.
getDebug
()
==
1
)
{
service
.
getSpec
().
setType
(
"NodePort"
);
service
.
getSpec
().
setType
(
"NodePort"
);
}
}
log
.
info
(
"开始在{}环境创建{}服务的k8s Service: \n{}"
,
namespace
,
serviceName
,
serviceYaml
);
log
.
info
(
"开始在{}环境创建{}服务的k8s Service: \n{}"
,
namespace
,
serviceName
,
YamlUtils
.
JsonToYamlStr
(
JSON
.
toJSONString
(
service
))
);
return
kubernetesClient
.
services
().
inNamespace
(
namespace
).
createOrReplace
(
service
);
return
kubernetesClient
.
services
().
inNamespace
(
namespace
).
createOrReplace
(
service
);
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
log
.
info
(
"Service创建失败."
);
log
.
info
(
"Service创建失败."
);
...
@@ -717,11 +717,11 @@ public class TkeService {
...
@@ -717,11 +717,11 @@ public class TkeService {
try
{
try
{
String
ingressYaml
=
FileUtils
.
readFileFromClassPathResource
(
"tke/template/Ingress.yml"
);
String
ingressYaml
=
FileUtils
.
readFileFromClassPathResource
(
"tke/template/Ingress.yml"
);
ingressYaml
=
TkeUtils
.
replaceBusinessYaml
(
ingressYaml
,
serviceCreateVo
,
null
);
ingressYaml
=
TkeUtils
.
replaceBusinessYaml
(
ingressYaml
,
serviceCreateVo
,
null
);
log
.
info
(
"开始在{}环境创建{}服务的k8 Ingress:\n{}"
,
serviceCreateVo
.
getNamespace
(),
serviceCreateVo
.
getServiceName
(),
ingressYaml
);
Yaml
yaml
=
new
Yaml
(
new
Constructor
(
Ingress
.
class
));
Yaml
yaml
=
new
Yaml
(
new
Constructor
(
Ingress
.
class
));
Ingress
ingress
=
yaml
.
load
(
ingressYaml
);
Ingress
ingress
=
yaml
.
load
(
ingressYaml
);
IntOrString
servicePort
=
new
IntOrStringBuilder
().
withIntVal
(
80
).
build
();
IntOrString
servicePort
=
new
IntOrStringBuilder
().
withIntVal
(
80
).
build
();
ingress
.
getSpec
().
getRules
().
get
(
0
).
getHttp
().
getPaths
().
get
(
0
).
getBackend
().
setServicePort
(
servicePort
);
ingress
.
getSpec
().
getRules
().
get
(
0
).
getHttp
().
getPaths
().
get
(
0
).
getBackend
().
setServicePort
(
servicePort
);
log
.
info
(
"开始在{}环境创建{}服务的k8 Ingress:\n{}"
,
serviceCreateVo
.
getNamespace
(),
serviceCreateVo
.
getServiceName
(),
YamlUtils
.
JsonToYamlStr
(
JSON
.
toJSONString
(
ingress
)));
return
kubernetesClient
.
extensions
().
ingresses
().
inNamespace
(
serviceCreateVo
.
getNamespace
()).
createOrReplace
(
ingress
);
return
kubernetesClient
.
extensions
().
ingresses
().
inNamespace
(
serviceCreateVo
.
getNamespace
()).
createOrReplace
(
ingress
);
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
log
.
info
(
"Ingress 创建失败!"
);
log
.
info
(
"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