github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(app): fix cpu type for decimals [r8s-107] (#12306)

pull/12309/head
Ali 2024-10-08 11:44:22 +13:00 committed by GitHub
parent 469a4e94c2
commit db4b1dd024
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/http/models/kubernetes/application.go
View File

@ -70,8 +70,8 @@ type TLSInfo struct {
// Existing types // Existing types
type K8sApplicationResource struct { type K8sApplicationResource struct {
CPURequest int64 `json:"CpuRequest"` CPURequest float64 `json:"CpuRequest"`
CPULimit int64 `json:"CpuLimit"` CPULimit float64 `json:"CpuLimit"`
MemoryRequest int64 `json:"MemoryRequest"` MemoryRequest int64 `json:"MemoryRequest"`
MemoryLimit int64 `json:"MemoryLimit"` MemoryLimit int64 `json:"MemoryLimit"`
} }

8
api/kubernetes/cli/applications.go
View File

@ -135,8 +135,8 @@ func (kcl *KubeClient) GetApplicationsResource(namespace, node string) (models.K
for _, pod := range pods.Items { for _, pod := range pods.Items {
for _, container := range pod.Spec.Containers { for _, container := range pod.Spec.Containers {
resource.CPURequest += container.Resources.Requests.Cpu().MilliValue() resource.CPURequest += float64(container.Resources.Requests.Cpu().MilliValue())
resource.CPULimit += container.Resources.Limits.Cpu().MilliValue() resource.CPULimit += float64(container.Resources.Limits.Cpu().MilliValue())
resource.MemoryRequest += container.Resources.Requests.Memory().Value() resource.MemoryRequest += container.Resources.Requests.Memory().Value()
resource.MemoryLimit += container.Resources.Limits.Memory().Value() resource.MemoryLimit += container.Resources.Limits.Memory().Value()
} }
@ -356,8 +356,8 @@ func updateApplicationWithService(application models.K8sApplication, services []
func calculateResourceUsage(pod corev1.Pod) models.K8sApplicationResource { func calculateResourceUsage(pod corev1.Pod) models.K8sApplicationResource {
resource := models.K8sApplicationResource{} resource := models.K8sApplicationResource{}
for _, container := range pod.Spec.Containers { for _, container := range pod.Spec.Containers {
resource.CPURequest += container.Resources.Requests.Cpu().MilliValue() resource.CPURequest += float64(container.Resources.Requests.Cpu().MilliValue())
resource.CPULimit += container.Resources.Limits.Cpu().MilliValue() resource.CPULimit += float64(container.Resources.Limits.Cpu().MilliValue())
resource.MemoryRequest += container.Resources.Requests.Memory().Value() resource.MemoryRequest += container.Resources.Requests.Memory().Value()
resource.MemoryLimit += container.Resources.Limits.Memory().Value() resource.MemoryLimit += container.Resources.Limits.Memory().Value()
} }