Commit 896894fd authored by 黎博's avatar 黎博

bug fix

parent 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:{}", JSON.toJSONString(deployment)); log.info("开始创建Java Deployment:{}", deployment.toString());
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:{}", JSON.toJSONString(deployment)); log.info("开始创建ui/node Deployment:{}", deployment.toString());
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:{}", JSON.toJSONString(redisPvc)); log.info("开始创建redis pvc:{}", redisPvc.toString());
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: {}", JSON.toJSONString(redisService)); log.info("开始创建redis Service: {}", redisService.toString());
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:{}", JSON.toJSONString(redisDeployment)); log.info("创建redis Deployment:{}", redisDeployment);
return kubernetesClient.apps().deployments().inNamespace(namespace).create(redisDeployment); return kubernetesClient.apps().deployments().inNamespace(namespace).create(redisDeployment);
} }
...@@ -2078,7 +2078,6 @@ public class K8sService { ...@@ -2078,7 +2078,6 @@ public class K8sService {
ingressRule.setHttp(httpIngressRuleValue); ingressRule.setHttp(httpIngressRuleValue);
ingressRuleList.add(ingressRule); ingressRuleList.add(ingressRule);
ingressSpec.setRules(ingressRuleList); ingressSpec.setRules(ingressRuleList);
System.out.println(JSON.toJSONString(ingressSpec));
ingress.setApiVersion("extensions/v1beta1"); ingress.setApiVersion("extensions/v1beta1");
ingress.setKind("Ingress"); ingress.setKind("Ingress");
...@@ -2195,7 +2194,7 @@ public class K8sService { ...@@ -2195,7 +2194,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)); log.info("创建新的环境: {}", namespace.toString());
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