From: Borislav Glozman Date: Wed, 11 Dec 2019 14:19:12 +0000 (+0000) Subject: Merge "[AAF] No resources limits on PODs" X-Git-Tag: 6.0.0~485 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=68793f5b5eda291aa35069ad4a82baa22b687974;hp=-c;p=oom.git Merge "[AAF] No resources limits on PODs" --- 68793f5b5eda291aa35069ad4a82baa22b687974 diff --combined kubernetes/aaf/charts/aaf-cm/values.yaml index 79e74f107e,fbf480ee68..2bd05d81ed --- a/kubernetes/aaf/charts/aaf-cm/values.yaml +++ b/kubernetes/aaf/charts/aaf-cm/values.yaml @@@ -52,28 -52,21 +52,27 @@@ service ingress: enabled: false + service: + - baseaddr: "aafcm" + name: "aaf-cm" + port: 8150 + config: + ssl: "none" # Configure resource requests and limits - resources: {} - # Allow END users to do this, if they want. Detrimental to Test services - # small: - # limits: - # cpu: 200m - # memory: 800Mi - # requests: - # cpu: 20m - # memory: 500Mi - # large: - # limits: - # cpu: 400m - # memory: 1Gi - # requests: - # cpu: 40m - # memory: 600Mi - # unlimited: {} + resources: + small: + limits: + cpu: 20m + memory: 300Mi + requests: + cpu: 1m + memory: 200Mi + large: + limits: + cpu: 400m + memory: 1Gi + requests: + cpu: 40m + memory: 600Mi + unlimited: {} diff --combined kubernetes/aaf/charts/aaf-fs/values.yaml index 67b3d2fe90,be3acece84..d1a35a744c --- a/kubernetes/aaf/charts/aaf-fs/values.yaml +++ b/kubernetes/aaf/charts/aaf-fs/values.yaml @@@ -54,28 -54,21 +54,27 @@@ service ingress: enabled: false + service: + - baseaddr: "aaffs" + name: "aaf-fs" + port: 8096 + config: + ssl: "none" # Configure resource requests and limits - resources: {} - # Allow END users to do this, if they want. Detrimental to Test services - # small: - # limits: - # cpu: 200m - # memory: 800Mi - # requests: - # cpu: 10m - # memory: 300Mi - # large: - # limits: - # cpu: 500m - # memory: 700Mi - # requests: - # cpu: 100m - # memory: 400Mi - # unlimited: {} + resources: + small: + limits: + cpu: 200m + memory: 110Mi + requests: + cpu: 1m + memory: 80Mi + large: + limits: + cpu: 500m + memory: 700Mi + requests: + cpu: 100m + memory: 400Mi + unlimited: {} diff --combined kubernetes/aaf/charts/aaf-gui/values.yaml index ba287a85ac,b348376c0d..1f7abd4b9d --- a/kubernetes/aaf/charts/aaf-gui/values.yaml +++ b/kubernetes/aaf/charts/aaf-gui/values.yaml @@@ -56,29 -56,21 +56,27 @@@ service ingress: enabled: false + service: + - baseaddr: "aafgui" + name: "aaf-gui" + port: 8200 + config: + ssl: "none" # Configure resource requests and limits - resources: {} - # Allow END users to do this, if they want. Detrimental to Test services - #resources: - # small: - # limits: - # cpu: 100m - # memory: 500Mi - # requests: - # cpu: 10m - # memory: 200Mi - # large: - # limits: - # cpu: 200m - # memory: 1Gi - # requests: - # cpu: 100m - # memory: 500Mi - # unlimited: {} + resources: + small: + limits: + cpu: 20m + memory: 280Mi + requests: + cpu: 1m + memory: 170Mi + large: + limits: + cpu: 200m + memory: 1Gi + requests: + cpu: 100m + memory: 500Mi + unlimited: {} diff --combined kubernetes/aaf/charts/aaf-hello/values.yaml index 4ea66733f2,70efeedcca..0f24a7c30d --- a/kubernetes/aaf/charts/aaf-hello/values.yaml +++ b/kubernetes/aaf/charts/aaf-hello/values.yaml @@@ -71,29 -71,21 +71,27 @@@ readiness ingress: enabled: false + service: + - baseaddr: "aafhello" + name: "aaf-hello" + port: 8130 + config: + ssl: "none" # Configure resource requests and limits - resources: {} - # Allow END users to do this, if they want. Detrimental to Test services - #resources: - # small: - # limits: - # cpu: 200m - # memory: 500Mi - # requests: - # cpu: 10m - # memory: 200Mi - # large: - # limits: - # cpu: 400m - # memory: 1Gi - # requests: - # cpu: 20m - # memory: 500Mi - # unlimited: {} + resources: + small: + limits: + cpu: 200m + memory: 500Mi + requests: + cpu: 10m + memory: 200Mi + large: + limits: + cpu: 400m + memory: 1Gi + requests: + cpu: 20m + memory: 500Mi + unlimited: {} diff --combined kubernetes/aaf/charts/aaf-locate/values.yaml index 82ad3b3b94,f15488d174..ce59d2dec9 --- a/kubernetes/aaf/charts/aaf-locate/values.yaml +++ b/kubernetes/aaf/charts/aaf-locate/values.yaml @@@ -52,29 -52,21 +52,27 @@@ service ingress: enabled: false + service: + - baseaddr: "aaflocate" + name: "aaf-locate" + port: 8095 + config: + ssl: "none" # Configure resource requests and limits - resources: {} - # Allow END users to do this, if they want. Detrimental to Test services - #resources: - # small: - # limits: - # cpu: 200m - # memory: 600Mi - # requests: - # cpu: 20m - # memory: 300Mi - # large: - # limits: - # cpu: 400m - # memory: 1Gi - # requests: - # cpu: 40m - # memory: 500Mi - # unlimited: {} + resources: + small: + limits: + cpu: 40m + memory: 320Mi + requests: + cpu: 1m + memory: 210Mi + large: + limits: + cpu: 400m + memory: 1Gi + requests: + cpu: 40m + memory: 500Mi + unlimited: {} diff --combined kubernetes/aaf/charts/aaf-oauth/values.yaml index 2ffeea8478,558e5038f2..ef00a464f4 --- a/kubernetes/aaf/charts/aaf-oauth/values.yaml +++ b/kubernetes/aaf/charts/aaf-oauth/values.yaml @@@ -51,29 -51,21 +51,27 @@@ service ingress: enabled: false + service: + - baseaddr: "aafoauth" + name: "aaf-oauth" + port: 8140 + config: + ssl: "none" # Configure resource requests and limits - resources: {} - # Allow END users to do this, if they want. Detrimental to Test services - #resources: - # small: - # limits: - # cpu: 200m - # memory: 400Mi - # requests: - # cpu: 20m - # memory: 200Mi - # large: - # limits: - # cpu: 400m - # memory: 600Mi - # requests: - # cpu: 40m - # memory: 200Mi - # unlimited: {} + resources: + small: + limits: + cpu: 40m + memory: 320Mi + requests: + cpu: 1m + memory: 210Mi + large: + limits: + cpu: 400m + memory: 600Mi + requests: + cpu: 40m + memory: 200Mi + unlimited: {} diff --combined kubernetes/aaf/charts/aaf-service/values.yaml index c8067bf6e6,beb7f6c5c8..190b284681 --- a/kubernetes/aaf/charts/aaf-service/values.yaml +++ b/kubernetes/aaf/charts/aaf-service/values.yaml @@@ -52,29 -52,21 +52,27 @@@ service ingress: enabled: false + service: + - baseaddr: "aafservice" + name: "aaf-service" + port: 8100 + config: + ssl: "none" # Configure resource requests and limits - resources: {} - # Allow END users to do this, if they want. Detrimental to Test services - #resources: - # small: - # limits: - # cpu: 200m - # memory: 800Mi - # requests: - # cpu: 20m - # memory: 300Mi - # large: - # limits: - # cpu: 400m - # memory: 1Gi - # requests: - # cpu: 40m - # memory: 300Mi - # unlimited: {} + resources: + small: + limits: + cpu: 250m + memory: 360Mi + requests: + cpu: 10m + memory: 250Mi + large: + limits: + cpu: 400m + memory: 1Gi + requests: + cpu: 40m + memory: 300Mi + unlimited: {}