[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>

6 files changed, 56 insertions, 56 deletions

diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
index 1dc9cf64da..74efe9c781 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
@@ -56,18 +56,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 1Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 2Gi
-      cpu: 2
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 # probe configuration parameters
 liveness:
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml
index 0f02693597..7cbfafbc76 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml
@@ -44,18 +44,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 1Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 2Gi
-      cpu: 2
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 # probe configuration parameters
 liveness:
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml
index d557f05be0..37e131ba91 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml
@@ -44,18 +44,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 1Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 2Gi
-      cpu: 2
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 # probe configuration parameters
 liveness:
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml
index 812a4e6e7b..6a1bc53582 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml
@@ -44,18 +44,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 1Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 2Gi
-      cpu: 2
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 # probe configuration parameters
 liveness:
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml
index 31a065fac4..e0a9b0cdd1 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml
@@ -44,18 +44,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 1Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 2Gi
-      cpu: 2
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 # probe configuration parameters
 liveness:
diff --git a/kubernetes/oof/components/oof-has/values.yaml b/kubernetes/oof/components/oof-has/values.yaml
index 2924ce825d..d528677087 100755
--- a/kubernetes/oof/components/oof-has/values.yaml
+++ b/kubernetes/oof/components/oof-has/values.yaml
@@ -73,18 +73,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      memory: 4Gi
-      cpu: 2
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #component overrides
@@ -113,18 +113,18 @@ etcd:
   resources: &etcd-resources
     small:
       limits:
-        cpu: 100m
-        memory: 300Mi
+        cpu: "100m"
+        memory: "0.3Gi"
       requests:
-        cpu: 10m
-        memory: 75Mi
+        cpu: "10m"
+        memory: "0.07Gi"
     large:
       limits:
-        cpu: 200m
-        memory: 1Gi
+        cpu: "200m"
+        memory: "1Gi"
       requests:
-        cpu: 50m
-        memory: 300Mi
+        cpu: "50m"
+        memory: "0.3Gi"
     unlimited: {}
 
 etcd-init: