Skip to content

H
holmes
Commit 47cc78c8 authored by 黎博's avatar 黎博
Browse files
Options

修复/k8s/listEnvVars接口

parent f74fb0f1
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 8 deletions
src/main/java/cn/qg/holmes/service/k8s/K8sService.java
View file @ 47cc78c8
...@@ -2290,6 +2290,10 @@ public class K8sService { ...@@ -2290,6 +2290,10 @@ public class K8sService {
String serviceName = pod.getMetadata().getLabels().get("qcloud-app"); String serviceName = pod.getMetadata().getLabels().get("qcloud-app");
serviceName = serviceName.replace("-", "_").toUpperCase(); serviceName = serviceName.replace("-", "_").toUpperCase();
envMap.put(serviceName + "_SERVICE_HOST", pod.getStatus().getHostIP()); envMap.put(serviceName + "_SERVICE_HOST", pod.getStatus().getHostIP());
// MYSQL需要额外加个参数
if (serviceName.equals("MYSQL")) {
envMap.put("DB_SERVICE_HOST", pod.getStatus().getHostIP());
}
} }
// 遍历Service列表 // 遍历Service列表
for (Service service: serviceList) { for (Service service: serviceList) {
...@@ -2297,15 +2301,17 @@ public class K8sService { ...@@ -2297,15 +2301,17 @@ public class K8sService {
List<ServicePort> servicePortList = service.getSpec().getPorts(); List<ServicePort> servicePortList = service.getSpec().getPorts();
if (service.getMetadata().getLabels().get("type").equals("base")) { if (service.getMetadata().getLabels().get("type").equals("base")) {
if (servicePortList.get(0).getPort() != null) { if (servicePortList.get(0).getPort() != null) {
envMap.put(serviceName + "_SERVICE_PORT", servicePortList.get(0).getPort()); envMap.put(serviceName + "_SERVICE_PORT", servicePortList.get(0).getNodePort());
// MYSQL需要额外加个参数
if (serviceName.equals("MYSQL")) { if (serviceName.equals("MYSQL")) {
envMap.put("DB_SERVICE_PORT", servicePortList.get(0).getPort()); envMap.put("DB_SERVICE_PORT", servicePortList.get(0).getNodePort());
} }
} }
for (ServicePort servicePort: servicePortList) { for (ServicePort servicePort: servicePortList) {
envMap.put(serviceName + "_SERVICE_PORT_" + servicePort.getPort(), servicePort.getPort()); envMap.put(serviceName + "_SERVICE_PORT_" + servicePort.getPort(), servicePort.getNodePort());
// MYSQL需要额外加个参数
if (serviceName.equals("MYSQL")) { if (serviceName.equals("MYSQL")) {
envMap.put("DB_SERVICE_PORT_" + servicePort.getPort(), servicePort.getPort()); envMap.put("DB_SERVICE_PORT_" + servicePort.getPort(), servicePort.getNodePort());
} }
} }
} else { } else {
...@@ -2313,11 +2319,10 @@ public class K8sService { ...@@ -2313,11 +2319,10 @@ public class K8sService {
envMap.put(serviceName + "_SERVICE_PORT", servicePortList.get(0).getNodePort()); envMap.put(serviceName + "_SERVICE_PORT", servicePortList.get(0).getNodePort());
} }
for (ServicePort servicePort: servicePortList) { for (ServicePort servicePort: servicePortList) {
if (servicePort.getNodePort() != null) { if (service.getSpec().getType().equals("NodePort")) {
envMap.put(serviceName + "_SERVICE_PORT_" + servicePort.getPort(), servicePort.getNodePort()); envMap.put(serviceName + "_SERVICE_PORT_" + servicePort.getPort(), servicePort.getNodePort());
} } else if (service.getSpec().getType().equals("ClusterIP")) {
if (servicePort.getPort() != null) { envMap.put(serviceName + "_SERVICE_PORT_" + servicePort.getName(), servicePort.getPort());
envMap.put(serviceName + "_SERVICE_PORT_" + servicePort.getPort(), servicePort.getPort());
} }
} }
} }
......
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