[COMMON] Harmonize resource settings
Update all resource settings to the kubernetes recommended
normalized form. Fix ReadinessCheck resource limits.
Issue-ID: OOM-3273
Change-Id: Ie10903b801e4dc1689bcec092162d711a431a7a6
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
index 6a4a802..f3aaa25 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
@@ -72,18 +72,18 @@
resources:
small:
limits:
- cpu: 200m
- memory: 500Mi
+ cpu: "200m"
+ memory: "0.5Gi"
requests:
- cpu: 100m
- memory: 250Mi
+ cpu: "100m"
+ memory: "0.2Gi"
large:
limits:
- cpu: 400m
- memory: 1000Mi
+ cpu: "400m"
+ memory: "1Gi"
requests:
- cpu: 200m
- memory: 500Mi
+ cpu: "200m"
+ memory: "0.5Gi"
unlimited: {}
# Log configuration
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
index 3222169..040ad08 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
@@ -74,18 +74,18 @@
resources:
small:
limits:
- cpu: 200m
- memory: 2000Mi
+ cpu: "200m"
+ memory: "2Gi"
requests:
- cpu: 100m
- memory: 1000Mi
+ cpu: "100m"
+ memory: "1Gi"
large:
limits:
- cpu: 400m
- memory: 4000Mi
+ cpu: "400m"
+ memory: "4Gi"
requests:
- cpu: 200m
- memory: 2000Mi
+ cpu: "200m"
+ memory: "2Gi"
unlimited: {}
# Log configuration
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
index b042388..9d4497d 100644
--- a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
@@ -52,6 +52,13 @@
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "0.5Gi"
+ requests:
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- name: {{ include "common.name" . }}
command:
diff --git a/kubernetes/vfc/components/vfc-nslcm/values.yaml b/kubernetes/vfc/components/vfc-nslcm/values.yaml
index 613c872..649c35c 100644
--- a/kubernetes/vfc/components/vfc-nslcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/values.yaml
@@ -93,18 +93,18 @@
resources:
small:
limits:
- cpu: 200m
- memory: 500Mi
+ cpu: "200m"
+ memory: "0.5Gi"
requests:
- cpu: 100m
- memory: 250Mi
+ cpu: "100m"
+ memory: "0.2Gi"
large:
limits:
- cpu: 400m
- memory: 1000Mi
+ cpu: "400m"
+ memory: "1Gi"
requests:
- cpu: 200m
- memory: 500Mi
+ cpu: "200m"
+ memory: "0.5Gi"
unlimited: {}
# Log configuration
diff --git a/kubernetes/vfc/components/vfc-redis/values.yaml b/kubernetes/vfc/components/vfc-redis/values.yaml
index 1c6c4b4..c772e7a 100644
--- a/kubernetes/vfc/components/vfc-redis/values.yaml
+++ b/kubernetes/vfc/components/vfc-redis/values.yaml
@@ -66,16 +66,16 @@
resources:
small:
limits:
- cpu: 200m
- memory: 500Mi
+ cpu: "200m"
+ memory: "0.5Gi"
requests:
- cpu: 100m
- memory: 250Mi
+ cpu: "100m"
+ memory: "0.2Gi"
large:
limits:
- cpu: 400m
- memory: 1000Mi
+ cpu: "400m"
+ memory: "1Gi"
requests:
- cpu: 200m
- memory: 500Mi
+ cpu: "200m"
+ memory: "0.5Gi"
unlimited: {}
\ No newline at end of file
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
index ffa834e..f131cf3 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
@@ -52,6 +52,13 @@
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "0.5Gi"
+ requests:
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- name: {{ include "common.name" . }}
command:
diff --git a/kubernetes/vfc/components/vfc-vnflcm/values.yaml b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
index e0f5b5e..9670d07 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
@@ -93,18 +93,18 @@
resources:
small:
limits:
- cpu: 200m
- memory: 500Mi
+ cpu: "200m"
+ memory: "0.5Gi"
requests:
- cpu: 100m
- memory: 250Mi
+ cpu: "100m"
+ memory: "0.2Gi"
large:
limits:
- cpu: 400m
- memory: 1000Mi
+ cpu: "400m"
+ memory: "1Gi"
requests:
- cpu: 200m
- memory: 500Mi
+ cpu: "200m"
+ memory: "0.5Gi"
unlimited: {}
# Log configuration
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
index 23ea79f..d5bbecd 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
@@ -52,6 +52,13 @@
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "0.5Gi"
+ requests:
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- name: {{ include "common.name" . }}
command:
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
index 696547a..35ebad5 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
@@ -92,18 +92,18 @@
resources:
small:
limits:
- cpu: 200m
- memory: 500Mi
+ cpu: "200m"
+ memory: "0.5Gi"
requests:
- cpu: 100m
- memory: 250Mi
+ cpu: "100m"
+ memory: "0.2Gi"
large:
limits:
- cpu: 400m
- memory: 1000Mi
+ cpu: "400m"
+ memory: "1Gi"
requests:
- cpu: 200m
- memory: 500Mi
+ cpu: "200m"
+ memory: "0.5Gi"
unlimited: {}
# Log configuration
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
index 9433e13..a5ad3f4 100644
--- a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
@@ -52,6 +52,13 @@
image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
+ resources:
+ limits:
+ cpu: "100m"
+ memory: "0.5Gi"
+ requests:
+ cpu: "3m"
+ memory: "0.02Gi"
containers:
- name: {{ include "common.name" . }}
command:
diff --git a/kubernetes/vfc/components/vfc-vnfres/values.yaml b/kubernetes/vfc/components/vfc-vnfres/values.yaml
index 4525610..58cfa16 100644
--- a/kubernetes/vfc/components/vfc-vnfres/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/values.yaml
@@ -93,18 +93,18 @@
resources:
small:
limits:
- cpu: 200m
- memory: 500Mi
+ cpu: "200m"
+ memory: "0.5Gi"
requests:
- cpu: 100m
- memory: 250Mi
+ cpu: "100m"
+ memory: "0.2Gi"
large:
limits:
- cpu: 400m
- memory: 1000Mi
+ cpu: "400m"
+ memory: "1Gi"
requests:
- cpu: 200m
- memory: 500Mi
+ cpu: "200m"
+ memory: "0.5Gi"
unlimited: {}
# Log configuration
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
index 258407b..abe7c61 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
@@ -72,18 +72,18 @@
resources:
small:
limits:
- cpu: 100m
- memory: 500Mi
+ cpu: "100m"
+ memory: "0.5Gi"
requests:
- cpu: 50m
- memory: 250Mi
+ cpu: "50m"
+ memory: "0.2Gi"
large:
limits:
- cpu: 200m
- memory: 1000Mi
+ cpu: "200m"
+ memory: "1Gi"
requests:
- cpu: 100m
- memory: 500Mi
+ cpu: "100m"
+ memory: "0.5Gi"
unlimited: {}
# Log configuration