Commit 6c22fb7f authored by 黎博's avatar 黎博

修复bug

parent fefc5ae6
...@@ -324,8 +324,10 @@ public class K8sService { ...@@ -324,8 +324,10 @@ public class K8sService {
public Map<String, Map<String, Object>> assign(String serviceName, Map<String, Map<String, Object>> podServiceMap, Map<String, Object> otherMap) { public Map<String, Map<String, Object>> assign(String serviceName, Map<String, Map<String, Object>> podServiceMap, Map<String, Object> otherMap) {
Map<String, Object> podService = podServiceMap.get(serviceName); Map<String, Object> podService = podServiceMap.get(serviceName);
for (Map.Entry<String, Object> entry: otherMap.entrySet()) { for (Map.Entry<String, Object> entry: otherMap.entrySet()) {
if (podService != null) {
podService.put(entry.getKey(), entry.getValue()); podService.put(entry.getKey(), entry.getValue());
} }
}
podServiceMap.put(serviceName, podService); podServiceMap.put(serviceName, podService);
return podServiceMap; return podServiceMap;
} }
...@@ -405,10 +407,10 @@ public class K8sService { ...@@ -405,10 +407,10 @@ public class K8sService {
public Map<String, Object> formatIngressInfo(Ingress ingress) { public Map<String, Object> formatIngressInfo(Ingress ingress) {
Map<String, Object> ingressMap = new HashMap<>(); Map<String, Object> ingressMap = new HashMap<>();
if (ingress.getSpec().getRules().size() > 0) { if (ingress.getSpec().getRules() != null && ingress.getSpec().getRules().size() > 0) {
ingressMap.put("host", ingress.getSpec().getRules().get(0).getHost()); ingressMap.put("host", ingress.getSpec().getRules().get(0).getHost());
} else { } else {
ingressMap.put("host", null); ingressMap.put("host", "");
} }
return ingressMap; return ingressMap;
} }
......
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