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

feat(k8s/application): Support multi-container pods applications (#4208)

Browse source 
* feat(application): Support multi-container pods applications

* feat(application): Support multi-container pods applications

* fix(application): use only one pod in app details and fix logs and console links

* fix(application): show all containers in containers datatable

* fix(application): fix order by pod name

* feat(k8s/application): minor UI update

* feat(k8s/application): minor UI update

* feat(k8s/application): minor UI update

* feat(k8s/application): minor UI update

* feat(k8s/application): minor UI update

* fix(application): fix persisted folders in application details

Co-authored-by: Anthony Lapenna <lapenna.anthony@gmail.com>
This commit is contained in:
Maxime Bajeux 2020-08-14 01:27:10 +02:00 • committed by GitHub
parent fe4a80c7bd
commit 00389a7da9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 358 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/kubernetes/helpers/resourceReservationHelper.js
View file

@ -9,13 +9,13 @@ class KubernetesResourceReservationHelper {
return _.reduce(
containers,
(acc, container) => {
if (container.resources && container.resources.requests) {
if (container.resources.requests.memory) {
acc.Memory += filesizeParser(container.resources.requests.memory, { base: 10 });
if (container.Requests) {
if (container.Requests.memory) {
acc.Memory += filesizeParser(container.Requests.memory, { base: 10 });
}
if (container.resources.requests.cpu) {
acc.CPU += KubernetesResourceReservationHelper.parseCPU(container.resources.requests.cpu);
if (container.Requests.cpu) {
acc.CPU += KubernetesResourceReservationHelper.parseCPU(container.Requests.cpu);
}
}