Commit 9cedf094 authored by 黎博's avatar 黎博

优化/k8s/service/modify接口

parent 964528a3
...@@ -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")) {
......
...@@ -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);
} }
......
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