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

17 files changed, 41 insertions, 41 deletions

diff --git a/kubernetes/common/cassandra/templates/backup/cronjob.yaml b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
index 8773cd3e4b..402d1688a7 100644
--- a/kubernetes/common/cassandra/templates/backup/cronjob.yaml
+++ b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
@@ -53,20 +53,20 @@ spec:
               resources:
                 limits:
                   cpu: "100m"
-                  memory: "0.5Gi"
+                  memory: "500Mi"
                 requests:
                   cpu: "3m"
-                  memory: "0.02Gi"
+                  memory: "20Mi"
             - name: "cassandra-backup-init"
               image: {{ include "repositoryGenerator.image.readiness" . }}
               imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
               resources:
                 limits:
                   cpu: "100m"
-                  memory: "0.5Gi"
+                  memory: "500Mi"
                 requests:
                   cpu: "3m"
-                  memory: "0.02Gi"
+                  memory: "20Mi"
               command:
               - /bin/bash
               - -c
diff --git a/kubernetes/common/common/templates/_log.tpl b/kubernetes/common/common/templates/_log.tpl
index ca296c5b35..993c48239a 100644
--- a/kubernetes/common/common/templates/_log.tpl
+++ b/kubernetes/common/common/templates/_log.tpl
@@ -30,10 +30,10 @@
   resources:
     requests:
       cpu: "10m"
-      memory: "0.005Gi"
+      memory: "5Mi"
     limits:
       cpu: "100m"
-      memory: "0.02Gi"
+      memory: "20Mi"
 {{- end -}}
 {{- end -}}
 
diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl
index 427e0cbad2..e21f0f658d 100644
--- a/kubernetes/common/common/templates/_mariadb.tpl
+++ b/kubernetes/common/common/templates/_mariadb.tpl
@@ -228,10 +228,10 @@ spec:
   resources:
     requests:
       cpu: "100m"
-      memory: "0.1Gi"
+      memory: "100Mi"
     limits:
       cpu: "300m"
-      memory: "0.5Gi"
+      memory: "500Mi"
 {{- end -}}
 
 {{/*
diff --git a/kubernetes/common/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml
index 8182103225..5d3038bcb1 100644
--- a/kubernetes/common/dgbuilder/templates/deployment.yaml
+++ b/kubernetes/common/dgbuilder/templates/deployment.yaml
@@ -75,10 +75,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/common/elasticsearch/components/curator/values.yaml b/kubernetes/common/elasticsearch/components/curator/values.yaml
index 0a5080e917..00f113b5bb 100644
--- a/kubernetes/common/elasticsearch/components/curator/values.yaml
+++ b/kubernetes/common/elasticsearch/components/curator/values.yaml
@@ -124,10 +124,10 @@ resources:
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits: {}
   #  cpu: "100m"
-  #  memory: "0.1Gi"
+  #  memory: "100Mi"
   requests: {}
   #  cpu: "100m"
-  #  memory: "0.1Gi"
+  #  memory: "100Mi"
 priorityClassName: ""
 # extraVolumes and extraVolumeMounts allows you to mount other volumes
 # Example Use Case: mount ssl certificates when elasticsearch has tls enabled
diff --git a/kubernetes/common/elasticsearch/components/data/values.yaml b/kubernetes/common/elasticsearch/components/data/values.yaml
index a0dad568d9..3f9992aaba 100644
--- a/kubernetes/common/elasticsearch/components/data/values.yaml
+++ b/kubernetes/common/elasticsearch/components/data/values.yaml
@@ -106,7 +106,7 @@ resources:
   ## resources, such as Minikube.
   limits: {}
   #   cpu: "100m"
-  #   memory: "0.1Gi"
+  #   memory: "100Mi"
   requests:
     cpu: "25m"
     memory: "1.1Gi"
diff --git a/kubernetes/common/elasticsearch/components/master/values.yaml b/kubernetes/common/elasticsearch/components/master/values.yaml
index f4ac74e2c3..a3a219ee31 100644
--- a/kubernetes/common/elasticsearch/components/master/values.yaml
+++ b/kubernetes/common/elasticsearch/components/master/values.yaml
@@ -111,10 +111,10 @@ resources:
     cpu: "250m"
     memory: "1.5Gi"
   #   cpu: "100m"
-  #   memory: "0.1Gi"
+  #   memory: "100Mi"
   requests:
     cpu: "5m"
-    memory: "0.3Gi"
+    memory: "300Mi"
 ## Elasticsearch master-eligible container's liveness and readiness probes
 ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
 ##
diff --git a/kubernetes/common/elasticsearch/values.yaml b/kubernetes/common/elasticsearch/values.yaml
index e1c8f72258..7851f2804f 100644
--- a/kubernetes/common/elasticsearch/values.yaml
+++ b/kubernetes/common/elasticsearch/values.yaml
@@ -95,10 +95,10 @@ resources:
   ## resources, such as Minikube.
   limits: {}
   #   cpu: "100m"
-  #   memory: "0.1Gi"
+  #   memory: "100Mi"
   requests:
     cpu: "25m"
-    memory: "0.2Gi"
+    memory: "200Mi"
 ## Elasticsearch coordinating-only container's liveness and readiness probes
 ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
 ##
diff --git a/kubernetes/common/etcd-init/templates/job.yaml b/kubernetes/common/etcd-init/templates/job.yaml
index 64c8b44071..f1f1b0e27e 100644
--- a/kubernetes/common/etcd-init/templates/job.yaml
+++ b/kubernetes/common/etcd-init/templates/job.yaml
@@ -50,10 +50,10 @@ spec:
         resources:
           limits:
             cpu: "100m"
-            memory: "0.5Gi"
+            memory: "500Mi"
           requests:
             cpu: "3m"
-            memory: "0.02Gi"
+            memory: "20Mi"
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
diff --git a/kubernetes/common/etcd-init/values.yaml b/kubernetes/common/etcd-init/values.yaml
index c9eac927eb..33e34fd086 100644
--- a/kubernetes/common/etcd-init/values.yaml
+++ b/kubernetes/common/etcd-init/values.yaml
@@ -60,17 +60,17 @@ resources:
   small:
     limits:
       cpu: "100m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "10m"
-      memory: "0.01Gi"
+      memory: "10Mi"
   large:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "20m"
-      memory: "0.02Gi"
+      memory: "20Mi"
   unlimited: {}
 
 #Pods Service Account
diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index 4a990768a0..29d643eb1e 100644
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -669,10 +669,10 @@ metrics:
     # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
     limits:
       cpu: "0.5"
-      memory: "0.2Gi"
+      memory: "200Mi"
     requests:
       cpu: "0.5"
-      memory: "0.2Gi"
+      memory: "200Mi"
   ## MariaDB Galera metrics container's liveness and readiness probes
   ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
   ##
diff --git a/kubernetes/common/mariadb-init/values.yaml b/kubernetes/common/mariadb-init/values.yaml
index e0ba28266a..5c181dded2 100644
--- a/kubernetes/common/mariadb-init/values.yaml
+++ b/kubernetes/common/mariadb-init/values.yaml
@@ -126,17 +126,17 @@ resources:
   small:
     limits:
       cpu: "100m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "10m"
-      memory: "0.01Gi"
+      memory: "10Mi"
   large:
     limits:
       cpu: "200m"
-      memory: "0.5Gi"
+      memory: "500Mi"
     requests:
       cpu: "20m"
-      memory: "0.02Gi"
+      memory: "20Mi"
   unlimited: {}
 
 #Pods Service Account
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml
index 010ec0f66a..4d05ae37c7 100644
--- a/kubernetes/common/network-name-gen/templates/deployment.yaml
+++ b/kubernetes/common/network-name-gen/templates/deployment.yaml
@@ -46,10 +46,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/common/postgres-init/values.yaml b/kubernetes/common/postgres-init/values.yaml
index 7e70019d73..d2eb090142 100644
--- a/kubernetes/common/postgres-init/values.yaml
+++ b/kubernetes/common/postgres-init/values.yaml
@@ -77,10 +77,10 @@ resources:
   small:
     limits:
       cpu: "100m"
-      memory: "0.3Gi"
+      memory: "300Mi"
     requests:
       cpu: "10m"
-      memory: "0.09Gi"
+      memory: "90Mi"
   large:
     limits:
       cpu: "2"
diff --git a/kubernetes/common/postgres/values.yaml b/kubernetes/common/postgres/values.yaml
index 5671f018ff..c0cdfef2d2 100644
--- a/kubernetes/common/postgres/values.yaml
+++ b/kubernetes/common/postgres/values.yaml
@@ -161,10 +161,10 @@ resources:
   small:
     limits:
       cpu: "100m"
-      memory: "0.3Gi"
+      memory: "300Mi"
     requests:
       cpu: "10m"
-      memory: "0.09Gi"
+      memory: "90Mi"
   large:
     limits:
       cpu: "2"
@@ -201,10 +201,10 @@ metrics:
     # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
     limits:
       cpu: "0.5"
-      memory: "0.2Gi"
+      memory: "200Mi"
     requests:
       cpu: "0.5"
-      memory: "0.2Gi"
+      memory: "200Mi"
   ## Postgres metrics container's liveness and readiness probes
   ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
   ##
diff --git a/kubernetes/common/readinessCheck/values.yaml b/kubernetes/common/readinessCheck/values.yaml
index 2fdb613c29..239743e106 100644
--- a/kubernetes/common/readinessCheck/values.yaml
+++ b/kubernetes/common/readinessCheck/values.yaml
@@ -20,7 +20,7 @@ group: 65533
 
 limits:
   cpu: "100m"
-  memory: "0.5Gi"
+  memory: "500Mi"
 requests:
   cpu: "3m"
-  memory: "0.02Gi"
+  memory: "20Mi"
diff --git a/kubernetes/common/timescaledb/values.yaml b/kubernetes/common/timescaledb/values.yaml
index b4070bb810..2643f55062 100644
--- a/kubernetes/common/timescaledb/values.yaml
+++ b/kubernetes/common/timescaledb/values.yaml
@@ -64,10 +64,10 @@ resources:
   small:
     limits:
       cpu: "100m"
-      memory: "0.3Gi"
+      memory: "300Mi"
     requests:
       cpu: "10m"
-      memory: "0.09Gi"
+      memory: "90Mi"
   large:
     limits:
       cpu: "2"