diff --git a/api/http/models/kubernetes/application.go b/api/http/models/kubernetes/application.go index d34edf816..97d26cad9 100644 --- a/api/http/models/kubernetes/application.go +++ b/api/http/models/kubernetes/application.go @@ -70,8 +70,8 @@ type TLSInfo struct { // Existing types type K8sApplicationResource struct { - CPURequest int64 `json:"CpuRequest"` - CPULimit int64 `json:"CpuLimit"` - MemoryRequest int64 `json:"MemoryRequest"` - MemoryLimit int64 `json:"MemoryLimit"` + CPURequest float64 `json:"CpuRequest"` + CPULimit float64 `json:"CpuLimit"` + MemoryRequest int64 `json:"MemoryRequest"` + MemoryLimit int64 `json:"MemoryLimit"` } diff --git a/api/kubernetes/cli/applications.go b/api/kubernetes/cli/applications.go index 86a14254b..cc89d20be 100644 --- a/api/kubernetes/cli/applications.go +++ b/api/kubernetes/cli/applications.go @@ -135,8 +135,8 @@ func (kcl *KubeClient) GetApplicationsResource(namespace, node string) (models.K for _, pod := range pods.Items { for _, container := range pod.Spec.Containers { - resource.CPURequest += container.Resources.Requests.Cpu().MilliValue() - resource.CPULimit += container.Resources.Limits.Cpu().MilliValue() + resource.CPURequest += float64(container.Resources.Requests.Cpu().MilliValue()) + resource.CPULimit += float64(container.Resources.Limits.Cpu().MilliValue()) resource.MemoryRequest += container.Resources.Requests.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 { resource := models.K8sApplicationResource{} for _, container := range pod.Spec.Containers { - resource.CPURequest += container.Resources.Requests.Cpu().MilliValue() - resource.CPULimit += container.Resources.Limits.Cpu().MilliValue() + resource.CPURequest += float64(container.Resources.Requests.Cpu().MilliValue()) + resource.CPULimit += float64(container.Resources.Limits.Cpu().MilliValue()) resource.MemoryRequest += container.Resources.Requests.Memory().Value() resource.MemoryLimit += container.Resources.Limits.Memory().Value() }