Commit 4f7c3afe authored by 黎博's avatar 黎博

修改下日志

parent 0f2fe09c
...@@ -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 创建失败!");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment