[COMMON] Harmonize resource settings, Part 2

Some settings are still wrongly interpreted (e.g. 0.02Gi)
Therefor they are changed to non-floating numbers (e.g. 20Mi)

Issue-ID: OOM-3273

Change-Id: Icc88dead1ac5b1df8629d6adcc438a739e20522e
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>

11 files changed, 29 insertions, 29 deletions

diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
index f3aaa25846..c96712be4f 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
@@ -73,17 +73,17 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
 
 # Log configuration
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
index 9d4497dadf..280c0388c9 100644
--- a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
@@ -55,10 +55,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       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 649c35c63a..48cce40822 100644
--- a/kubernetes/vfc/components/vfc-nslcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/values.yaml
@@ -94,17 +94,17 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
 
 # Log configuration
diff --git a/kubernetes/vfc/components/vfc-redis/values.yaml b/kubernetes/vfc/components/vfc-redis/values.yaml
index c772e7ac2c..60c95b9b7c 100644
--- a/kubernetes/vfc/components/vfc-redis/values.yaml
+++ b/kubernetes/vfc/components/vfc-redis/values.yaml
@@ -67,15 +67,15 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   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 f131cf3d38..a9cf562e5b 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
@@ -55,10 +55,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       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 9670d07673..bc22a32206 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
@@ -94,17 +94,17 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
 
 # Log configuration
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
index d5bbecd183..7644ba34d5 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
@@ -55,10 +55,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       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 35ebad5ae0..31b5a66fd0 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
@@ -93,17 +93,17 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
 
 # Log configuration
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
index a5ad3f495b..ae9656ac4f 100644
--- a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
@@ -55,10 +55,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       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 58cfa161af..2c54249de4 100644
--- a/kubernetes/vfc/components/vfc-vnfres/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/values.yaml
@@ -94,17 +94,17 @@ resources:
   small:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "100m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "400m"
       memory: "1Gi"
     requests:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   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 abe7c6100e..3588ba548e 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
@@ -73,17 +73,17 @@ resources:
   small:
     limits:
       cpu: "100m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "50m"
-      memory: "0.2Gi"
+      memory: "200Mi"
   large:
     limits:
       cpu: "200m"
       memory: "1Gi"
     requests:
       cpu: "100m"
-      memory: "0.5Gi"
+      memory: "500Mi"
   unlimited: {}
 
 # Log configuration