Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-22 23:09:41 +02:00
Code Issues Releases Activity

fix(app): use standard resource request units [r8s-122] (#15)

Browse source
This commit is contained in:
Ali 2024-10-14 11:27:22 +13:00 • committed by GitHub
parent c88382ec1f
commit a06a09afcf
3 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/kubernetes/views/cluster/node/nodeController.js
View file

@ -363,7 +363,9 @@ class KubernetesNodeController {
useServerMetrics: this.endpoint.Kubernetes.Configuration.UseServerMetrics,
};
await Promise.allSettled([this.getNodes(), this.getEvents(), this.getEndpoints(), this.getNodeUsage()]);
// getEvents depends on nodes, so get nodes first
await this.getNodes();
await Promise.allSettled([this.getEvents(), this.getEndpoints(), this.getNodeUsage()]);
this.availableEffects = _.values(KubernetesNodeTaintEffects);
this.formValues = KubernetesNodeConverter.nodeToFormValues(this.node);
@ -371,7 +373,6 @@ class KubernetesNodeController {
this.formValues.Labels = KubernetesNodeHelper.reorderLabels(this.formValues.Labels);
this.resourceReservation = await getTotalResourcesForAllApplications(this.$state.params.endpointId, this.node.Name);
this.resourceReservation.CpuRequest = Math.round(this.resourceReservation.CpuRequest / 1000);
this.resourceReservation.MemoryRequest = KubernetesResourceReservationHelper.megaBytesValue(this.resourceReservation.MemoryRequest);
this.node.Memory = KubernetesResourceReservationHelper.megaBytesValue(this.node.Memory);