Merge branch 'master' into k8s

src/main/java/cn/qg/holmes/service/k8s/K8sService.java

@@ -324,7 +324,7 @@ public class K8sService {
         // 对象转列表
         List<Map<String, Object>> resultList = new ArrayList<>();
         for (Map<String, Object> map: podServiceMap.values()) {
-            if (map != null) {
+            if ((map != null) && (map.get("serviceName") != null))  {
                 resultList.add(map);
             }
         }
@@ -1402,7 +1402,7 @@ public class K8sService {
     public Service createMongodbService(String namespace) {
         Service mongodbService = new Service();
 
-        ObjectMeta objectMeta = buildObjectMeta("fe", "mongodb", "base");
+        ObjectMeta objectMeta = buildObjectMeta(namespace, "mongodb", "base");
 
         ServiceSpec serviceSpec = new ServiceSpec();
         serviceSpec.setType("NodePort");
@@ -1507,7 +1507,7 @@ public class K8sService {
         cpuRequest.setFormat("m");
         memoryRequest.setAmount("256");
         memoryRequest.setFormat("Mi");
-        cpuLimit.setAmount("250");
+        cpuLimit.setAmount("1024");
         cpuLimit.setFormat("m");
         memoryLimit.setAmount("512");
         memoryLimit.setFormat("Mi");