admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix resource limit

Browse Source
This commit is contained in:
jeff
2018-06-29 21:10:14 +08:00
parent 8b61c25f69
commit 859305b517
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/models/metrics/containers.go
View File

@@ -83,7 +83,7 @@ func FormatContainerMetrics(namespace, podName, containerName string) ContainerM
cpuRequestMetrics, err := cpuRequest.GetObjectArray("metrics")
if err == nil && len(cpuRequestMetrics) != 0 {
requestCpu, _ := cpuRequestMetrics[0].GetFloat64("value")
resultContainer.CpuRequest = fmt.Sprintf("%.1f", requestCpu)
resultContainer.CpuRequest = FormatResourceLimit(requestCpu)
} else {
resultContainer.CpuRequest = Inf
}
@@ -92,7 +92,7 @@ func FormatContainerMetrics(namespace, podName, containerName string) ContainerM
cpuLimitMetrics, err := cpuLimit.GetObjectArray("metrics")
if err == nil && len(cpuLimitMetrics) != 0 {
limitCpu, _ := cpuLimitMetrics[0].GetFloat64("value")
resultContainer.CpuLimit = fmt.Sprintf("%.1f", limitCpu)
resultContainer.CpuLimit = FormatResourceLimit(limitCpu)
} else {
resultContainer.CpuLimit = Inf
}
@@ -101,7 +101,7 @@ func FormatContainerMetrics(namespace, podName, containerName string) ContainerM
memoryRequstMetrics, err := memoryRequst.GetObjectArray("metrics")
if err == nil && len(memoryRequstMetrics) != 0 {
requestMemory, _ := memoryRequstMetrics[0].GetFloat64("value")
resultContainer.MemoryRequest = fmt.Sprintf("%.1f", requestMemory)
resultContainer.MemoryRequest = FormatResourceLimit(requestMemory)
} else {
resultContainer.MemoryRequest = Inf
}
@@ -110,7 +110,7 @@ func FormatContainerMetrics(namespace, podName, containerName string) ContainerM
memoryLimitMetrics, err := memoryLimit.GetObjectArray("metrics")
if err == nil && len(memoryLimitMetrics) != 0 {
limitMemory, _ := memoryLimitMetrics[0].GetFloat64("value")
resultContainer.MemoryLimit = fmt.Sprintf("%.1f", limitMemory)
resultContainer.MemoryLimit = FormatResourceLimit(limitMemory)
} else {
resultContainer.MemoryLimit = Inf
}