Commit 5aa09cda authored by 黎博's avatar 黎博

bug修复

parent e2dd9f5b
...@@ -155,7 +155,7 @@ public class K8sController { ...@@ -155,7 +155,7 @@ public class K8sController {
} else if (label.equals("java")) { } else if (label.equals("java")) {
DockerProject dockerProject = dockerProjectService.getOne(queryWrapper); DockerProject dockerProject = dockerProjectService.getOne(queryWrapper);
if (!k8sService.queryIfServiceExistByName(namespace, serviceName)) { if (!k8sService.queryIfServiceExistByName(namespace, serviceName)) {
k8sService.createJavaService(namespace, serviceName); k8sService.createJavaService(namespace, serviceName, serviceCreateVo.getDebug());
} }
if (!k8sService.queryIfDeploymentExistByName(namespace, serviceName)) { if (!k8sService.queryIfDeploymentExistByName(namespace, serviceName)) {
k8sService.createJavaDeployment(serviceCreateVo, dockerProject); k8sService.createJavaDeployment(serviceCreateVo, dockerProject);
...@@ -234,7 +234,7 @@ public class K8sController { ...@@ -234,7 +234,7 @@ public class K8sController {
if (label.equals("java")) { if (label.equals("java")) {
deployment = k8sService.createJavaDeployment(serviceCreateVo, dockerProject); deployment = k8sService.createJavaDeployment(serviceCreateVo, dockerProject);
if (!k8sService.queryIfServiceExistByName(namespace, serviceName)) { if (!k8sService.queryIfServiceExistByName(namespace, serviceName)) {
k8sService.createJavaService(namespace, serviceName); k8sService.createJavaService(namespace, serviceName, serviceCreateVo.getDebug());
} }
if (!k8sService.queryIfIngressExistByName(namespace, serviceName)) { if (!k8sService.queryIfIngressExistByName(namespace, serviceName)) {
k8sService.createIngress(namespace, serviceName, serviceCreateVo.getDomain()); k8sService.createIngress(namespace, serviceName, serviceCreateVo.getDomain());
......
...@@ -470,7 +470,7 @@ public class K8sService { ...@@ -470,7 +470,7 @@ public class K8sService {
* 部署Java服务 * 部署Java服务
* @return * @return
*/ */
public Service createJavaService(String namespace, String serviceName) { public Service createJavaService(String namespace, String serviceName, Integer debug) {
Service service = new Service(); Service service = new Service();
ObjectMeta objectMeta = new ObjectMeta(); ObjectMeta objectMeta = new ObjectMeta();
ServiceSpec serviceSpec = new ServiceSpec(); ServiceSpec serviceSpec = new ServiceSpec();
...@@ -501,7 +501,11 @@ public class K8sService { ...@@ -501,7 +501,11 @@ public class K8sService {
selector.put("qcloud-app", serviceName); selector.put("qcloud-app", serviceName);
// 设置serviceSpec // 设置serviceSpec
serviceSpec.setType("ClusterIP"); if (debug == 1) {
serviceSpec.setType("NodePort");
} else {
serviceSpec.setType("ClusterIP");
}
serviceSpec.setPorts(portList); serviceSpec.setPorts(portList);
serviceSpec.setSelector(selector); serviceSpec.setSelector(selector);
......
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