Skip to content

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

修复limit问题

parent 879ddc85
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
src/main/java/cn/qg/holmes/service/k8s/K8sService.java
View file @ de48106d
...@@ -650,6 +650,8 @@ public class K8sService { ...@@ -650,6 +650,8 @@ public class K8sService {
memoryLimit.setFormat("Mi"); memoryLimit.setFormat("Mi");
requests.put("cpu", cpuQuantity); requests.put("cpu", cpuQuantity);
requests.put("memory", memoryQuantity); requests.put("memory", memoryQuantity);
limits.put("cpu", cpuLimit);
limits.put("memory", memoryLimit);
resourceRequirements.setRequests(requests); resourceRequirements.setRequests(requests);
resourceRequirements.setLimits(limits); resourceRequirements.setLimits(limits);
container.setResources(resourceRequirements); container.setResources(resourceRequirements);
...@@ -876,6 +878,8 @@ public class K8sService { ...@@ -876,6 +878,8 @@ public class K8sService {
memoryLimit.setFormat("Mi"); memoryLimit.setFormat("Mi");
requests.put("cpu", cpuQuantity); requests.put("cpu", cpuQuantity);
requests.put("memory", memoryQuantity); requests.put("memory", memoryQuantity);
limits.put("cpu", cpuLimit);
limits.put("memory", memoryLimit);
resourceRequirements.setRequests(requests); resourceRequirements.setRequests(requests);
resourceRequirements.setLimits(limits); resourceRequirements.setLimits(limits);
container.setResources(resourceRequirements); container.setResources(resourceRequirements);
...@@ -1282,6 +1286,8 @@ public class K8sService { ...@@ -1282,6 +1286,8 @@ public class K8sService {
memoryLimit.setFormat("Gi"); memoryLimit.setFormat("Gi");
requests.put("cpu", cpuQuantity); requests.put("cpu", cpuQuantity);
requests.put("memory", memoryQuantity); requests.put("memory", memoryQuantity);
limits.put("cpu", cpuLimit);
limits.put("memory", memoryLimit);
resourceRequirements.setRequests(requests); resourceRequirements.setRequests(requests);
resourceRequirements.setLimits(limits); resourceRequirements.setLimits(limits);
container.setResources(resourceRequirements); container.setResources(resourceRequirements);
...@@ -1507,6 +1513,8 @@ public class K8sService { ...@@ -1507,6 +1513,8 @@ public class K8sService {
memoryLimit.setFormat("Mi"); memoryLimit.setFormat("Mi");
requests.put("cpu", cpuRequest); requests.put("cpu", cpuRequest);
requests.put("memory", memoryRequest); requests.put("memory", memoryRequest);
limits.put("cpu", cpuLimit);
limits.put("memory", memoryLimit);
resourceRequirements.setRequests(requests); resourceRequirements.setRequests(requests);
resourceRequirements.setLimits(limits); resourceRequirements.setLimits(limits);
container.setResources(resourceRequirements); container.setResources(resourceRequirements);
......
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