[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/a1policymanagement/values.yaml b/kubernetes/a1policymanagement/values.yaml
index 64c4d58..026b67e 100644 (file)
--- a/kubernetes/a1policymanagement/values.yaml
+++ b/kubernetes/a1policymanagement/values.yaml
@@ -92,18 +92,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 600Mi
+      cpu: "2"
+      memory: "0.6Gi"
     requests:
-      cpu: 1
-      memory: 300Mi
+      cpu: "1"
+      memory: "0.3Gi"
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: "4"
+      memory: "8Gi"
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
   unlimited: {}
 
 ## Persist data to a persistent volume

diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml
index c9f930a..e058d82 100644 (file)
--- a/kubernetes/aai/components/aai-babel/values.yaml
+++ b/kubernetes/aai/components/aai-babel/values.yaml
@@ -81,18 +81,18 @@ serviceMesh:
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: "4"
+      memory: "8Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
index c3e36c2..234718c 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
@@ -99,6 +99,13 @@ spec:
         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"
       {{  end  }}
       containers:
       - name: {{ include "common.name" . }}

diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
index 865dfe3..a36d904 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
@@ -74,6 +74,13 @@ spec:
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-db-backup-readiness
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       {{- end }}
       containers:
       - name: {{ include "common.name" . }}-db-backup-job

diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
index 1a81249..7d2504e 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
@@ -75,6 +75,13 @@ spec:
         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" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
index bf3279f..6310f9e 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
@@ -80,6 +80,13 @@ spec:
         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"
       - command:
         - sh
         args:
@@ -228,6 +235,13 @@ spec:
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-db-backup-readiness
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       {{- end }}
       containers:
       - name: {{ include "common.name" . }}-db-backup-job

diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml
index e320f51..8b6b5f9 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@ -246,18 +246,18 @@ accessLogback:
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 0.5
-      memory: 1.6Gi
+      cpu: "0.5"
+      memory: "1.6Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 1
-      memory: 3.2Gi
+      cpu: "1"
+      memory: "3.2Gi"
   unlimited: {}
 
 metrics:

diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml
index 57c562b..aa62f60 100644 (file)
--- a/kubernetes/aai/components/aai-modelloader/values.yaml
+++ b/kubernetes/aai/components/aai-modelloader/values.yaml
@@ -65,18 +65,18 @@ readiness:
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
index 54097fa..edf63c5 100644 (file)
--- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
@@ -123,6 +123,13 @@ spec:
               fieldPath: metadata.namespace
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 007c60e..b1d3202 100644 (file)
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -262,26 +262,26 @@ serviceMesh:
   # Minimum memory for production is 4 CPU cores and 8GB memory
 #resources:
 #  limits:
-#    cpu: 2
-#    memory: 4Gi
+#    cpu: "2"
+#    memory: "4Gi"
 #  requests:
-#    cpu: 2
-#    memory: 4Gi
+#    cpu: "2"
+#    memory: "4Gi"
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 3Gi
+      cpu: "1"
+      memory: "3Gi"
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: "4"
+      memory: "8Gi"
     requests:
-      cpu: 2
-      memory: 6Gi
+      cpu: "2"
+      memory: "6Gi"
   unlimited: {}
 
 tracing:

diff --git a/kubernetes/aai/components/aai-schema-service/values.yaml b/kubernetes/aai/components/aai-schema-service/values.yaml
index 4266978..ccda86d 100644 (file)
--- a/kubernetes/aai/components/aai-schema-service/values.yaml
+++ b/kubernetes/aai/components/aai-schema-service/values.yaml
@@ -117,26 +117,26 @@ serviceMesh:
   # Minimum memory for production is 4 CPU cores and 8GB memory
 #resources:
 #  limits:
-#    cpu: 2
-#    memory: 4Gi
+#    cpu: "2"
+#    memory: "4Gi"
 #  requests:
-#    cpu: 2
-#    memory: 4Gi
+#    cpu: "2"
+#    memory: "4Gi"
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 3Gi
+      cpu: "1"
+      memory: "3Gi"
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: "4"
+      memory: "8Gi"
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
index cf7a309..d955837 100644 (file)
--- a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
@@ -48,6 +48,13 @@ spec:
         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" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/aai/components/aai-sparky-be/values.yaml b/kubernetes/aai/components/aai-sparky-be/values.yaml
index 8cfd2c6..0a9de51 100644 (file)
--- a/kubernetes/aai/components/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/values.yaml
@@ -109,18 +109,18 @@ podAnnotations:
 resources:
   small:
     limits:
-      cpu: 0.5
-      memory: 4Gi
+      cpu: "0.5"
+      memory: "4Gi"
     requests:
-      cpu: 0.25
-      memory: 1Gi
+      cpu: "0.25"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 1
-      memory: 8Gi
+      cpu: "1"
+      memory: "8Gi"
     requests:
-      cpu: 0.5
-      memory: 2Gi
+      cpu: "0.5"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
index 8f52fe2..3171d4c 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
@@ -142,6 +142,13 @@ spec:
         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" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/aai/components/aai-traversal/templates/job.yaml b/kubernetes/aai/components/aai-traversal/templates/job.yaml
index 71816d7..2d7daf1 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/job.yaml
@@ -58,6 +58,13 @@ spec:
         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" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index a1c383e..aca1ec7 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -286,18 +286,18 @@ accessLogback:
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 3Gi
+      cpu: "1"
+      memory: "3Gi"
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: "4"
+      memory: "8Gi"
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
   unlimited: {}
 
 endpoints:

diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 6e90089..ddb018e 100644 (file)
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -331,8 +331,8 @@ affinity: {}
 haproxy:
   initContainers:
     resources:
-      memory: 100Mi
-      cpu: 50m
+      cpu: "50m"
+      memory: "0.5Gi"
   requestBlocking:
     enabled: false
     customConfigs: []
@@ -443,18 +443,18 @@ serviceMesh:
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 1.2Gi
+      cpu: "1"
+      memory: "1.2Gi"
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: "4"
+      memory: "8Gi"
     requests:
-      cpu: 2
-      memory: 2.4Gi
+      cpu: "2"
+      memory: "2.4Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/cds/components/cds-blueprints-processor/values.yaml b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
index 3244748..3d931d3 100755 (executable)
--- a/kubernetes/cds/components/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
@@ -203,18 +203,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1.8Gi
+      cpu: "1"
+      memory: "1.8Gi"
     requests:
-      cpu: 0.5
-      memory: 1.8Gi
+      cpu: "0.5"
+      memory: "1.8Gi"
   large:
     limits:
-      cpu: 2
-      memory: 3.6Gi
+      cpu: "2"
+      memory: "3.6Gi"
     requests:
-      cpu: 1
-      memory: 3.6Gi
+      cpu: "1"
+      memory: "3.6Gi"
   unlimited: {}
 
 readinessCheck:

diff --git a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
index 883f7f8..f7a9c9c 100755 (executable)
--- a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
@@ -44,6 +44,13 @@ spec:
         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" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/cds/components/cds-command-executor/values.yaml b/kubernetes/cds/components/cds-command-executor/values.yaml
index 70d2f09..2af68e6 100755 (executable)
--- a/kubernetes/cds/components/cds-command-executor/values.yaml
+++ b/kubernetes/cds/components/cds-command-executor/values.yaml
@@ -81,18 +81,18 @@ ingress:
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.2Gi
+      cpu: "1"
+      memory: "0.2Gi"
     requests:
-      cpu: 0.5
-      memory: 0.2Gi
+      cpu: "0.5"
+      memory: "0.2Gi"
   large:
     limits:
-      cpu: 2
-      memory: 0.4Gi
+      cpu: "2"
+      memory: "0.4Gi"
     requests:
-      cpu: 1
-      memory: 0.4Gi
+      cpu: "1"
+      memory: "0.4Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/cds/components/cds-py-executor/values.yaml b/kubernetes/cds/components/cds-py-executor/values.yaml
index 148a98d..427abf8 100755 (executable)
--- a/kubernetes/cds/components/cds-py-executor/values.yaml
+++ b/kubernetes/cds/components/cds-py-executor/values.yaml
@@ -97,18 +97,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.2Gi
+      cpu: "1"
+      memory: "0.2Gi"
     requests:
-      cpu: 0.5
-      memory: 0.2Gi
+      cpu: "0.5"
+      memory: "0.2Gi"
   large:
     limits:
-      cpu: 2
-      memory: 0.4Gi
+      cpu: "2"
+      memory: "0.4Gi"
     requests:
-      cpu: 1
-      memory: 0.4Gi
+      cpu: "1"
+      memory: "0.4Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
index c0302d1..8688d8b 100644 (file)
--- a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
@@ -40,6 +40,13 @@ spec:
           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" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/cds/components/cds-sdc-listener/values.yaml b/kubernetes/cds/components/cds-sdc-listener/values.yaml
index 3918825..19de4e2 100644 (file)
--- a/kubernetes/cds/components/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/values.yaml
@@ -97,18 +97,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.7Gi
+      cpu: "1"
+      memory: "0.7Gi"
     requests:
-      cpu: 0.5
-      memory: 0.7Gi
+      cpu: "0.5"
+      memory: "0.7Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1.4Gi
+      cpu: "2"
+      memory: "1.4Gi"
     requests:
-      cpu: 1
-      memory: 1.4Gi
+      cpu: "1"
+      memory: "1.4Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/cds/components/cds-ui/values.yaml b/kubernetes/cds/components/cds-ui/values.yaml
index cadf716..dfc20be 100644 (file)
--- a/kubernetes/cds/components/cds-ui/values.yaml
+++ b/kubernetes/cds/components/cds-ui/values.yaml
@@ -98,18 +98,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.2Gi
+      cpu: "1"
+      memory: "0.2Gi"
     requests:
-      cpu: 0.5
-      memory: 0.2Gi
+      cpu: "0.5"
+      memory: "0.2Gi"
   large:
     limits:
-      cpu: 2
-      memory: 0.2Gi
+      cpu: "2"
+      memory: "0.2Gi"
     requests:
-      cpu: 1
-      memory: 0.2Gi
+      cpu: "1"
+      memory: "0.2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/cds/values.yaml b/kubernetes/cds/values.yaml
index ae3137c..ced4f1d 100644 (file)
--- a/kubernetes/cds/values.yaml
+++ b/kubernetes/cds/values.yaml
@@ -128,16 +128,16 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: "4"
+      memory: "8Gi"
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
   unlimited: {}

diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml
index 437e04a..60b1484 100644 (file)
--- a/kubernetes/cli/values.yaml
+++ b/kubernetes/cli/values.yaml
@@ -79,18 +79,18 @@ readiness:
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
     requests:
-      cpu: 10m
-      memory: 500Mi
+      cpu: "10m"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: "4"
+      memory: "8Gi"
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/common/cassandra/templates/backup/cronjob.yaml b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
index 06bb743..8773cd3 100644 (file)
--- a/kubernetes/common/cassandra/templates/backup/cronjob.yaml
+++ b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
@@ -50,9 +50,23 @@ spec:
               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"
             - name: "cassandra-backup-init"
               image: {{ include "repositoryGenerator.image.readiness" . }}
               imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+              resources:
+                limits:
+                  cpu: "100m"
+                  memory: "0.5Gi"
+                requests:
+                  cpu: "3m"
+                  memory: "0.02Gi"
               command:
               - /bin/bash
               - -c

diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml
index b5c74ea..2fc368f 100644 (file)
--- a/kubernetes/common/cassandra/values.yaml
+++ b/kubernetes/common/cassandra/values.yaml
@@ -210,11 +210,11 @@ configOverrides: {}
   # Minimum memory for production is 4 CPU cores and 8GB memory
 resources:
   limits:
-    cpu: 2
-    memory: 8Gi
+    cpu: "2"
+    memory: "8Gi"
   requests:
-    cpu: 0.2
-    memory: 2.5Gi
+    cpu: "0.2"
+    memory: "2.5Gi"
 backup:
   enabled: false
   cron: "00 00 * * *"

diff --git a/kubernetes/common/common/templates/_log.tpl b/kubernetes/common/common/templates/_log.tpl
index 369c25b..ca296c5 100644 (file)
--- a/kubernetes/common/common/templates/_log.tpl
+++ b/kubernetes/common/common/templates/_log.tpl
@@ -29,11 +29,11 @@
     mountPath: /usr/share/filebeat/data
   resources:
     requests:
-      memory: "5Mi"
       cpu: "10m"
+      memory: "0.005Gi"
     limits:
-      memory: "20Mi"
       cpu: "100m"
+      memory: "0.02Gi"
 {{- end -}}
 {{- end -}}
 

diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl
index a0dd49d..427e0cb 100644 (file)
--- a/kubernetes/common/common/templates/_mariadb.tpl
+++ b/kubernetes/common/common/templates/_mariadb.tpl
@@ -227,11 +227,11 @@ spec:
     {{- end }}
   resources:
     requests:
-      cpu: 100m
-      memory: 128Mi
+      cpu: "100m"
+      memory: "0.1Gi"
     limits:
-      cpu: 300m
-      memory: 512Mi
+      cpu: "300m"
+      memory: "0.5Gi"
 {{- end -}}
 
 {{/*

diff --git a/kubernetes/common/common/templates/_resources.tpl b/kubernetes/common/common/templates/_resources.tpl
index cd60b99..11177c7 100644 (file)
--- a/kubernetes/common/common/templates/_resources.tpl
+++ b/kubernetes/common/common/templates/_resources.tpl
@@ -39,18 +39,18 @@
   e.g:  resources:
           small:
             limits:
-              cpu: 200m
-              memory: 4Gi
+              cpu: "200m"
+              memory: "4Gi"
             requests:
-              cpu: 100m
-              memory: 1Gi
+              cpu: "100m"
+              memory: "1Gi"
           large:
             limits:
-              cpu: 400m
-              memory: 8Gi
+              cpu: "400m"
+              memory: "8Gi"
             requests:
-              cpu: 200m
-              memory: 2Gi
+              cpu: "200m"
+              memory: "2Gi"
           unlimited: {}
 */ -}}
 {{- define "common.resources" -}}

diff --git a/kubernetes/common/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml
index 84d6bc1..8182103 100644 (file)
--- a/kubernetes/common/dgbuilder/templates/deployment.yaml
+++ b/kubernetes/common/dgbuilder/templates/deployment.yaml
@@ -72,6 +72,13 @@ spec:
         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" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/common/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml
index b66bbde..c4dcb2f 100644 (file)
--- a/kubernetes/common/dgbuilder/values.yaml
+++ b/kubernetes/common/dgbuilder/values.yaml
@@ -152,18 +152,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: "4"
+      memory: "8Gi"
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/common/elasticsearch/components/curator/values.yaml b/kubernetes/common/elasticsearch/components/curator/values.yaml
index 62964ff..0a5080e 100644 (file)
--- a/kubernetes/common/elasticsearch/components/curator/values.yaml
+++ b/kubernetes/common/elasticsearch/components/curator/values.yaml
@@ -123,11 +123,11 @@ resources:
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits: {}
-  #  cpu: 100m
-  #  memory: 128Mi
+  #  cpu: "100m"
+  #  memory: "0.1Gi"
   requests: {}
-  #  cpu: 100m
-  #  memory: 128Mi
+  #  cpu: "100m"
+  #  memory: "0.1Gi"
 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 1dc9ab8..a0dad56 100644 (file)
--- a/kubernetes/common/elasticsearch/components/data/values.yaml
+++ b/kubernetes/common/elasticsearch/components/data/values.yaml
@@ -105,11 +105,11 @@ resources:
   ## choice for the user. This also increases chances charts run on environments with little
   ## resources, such as Minikube.
   limits: {}
-  #   cpu: 100m
-  #   memory: 128Mi
+  #   cpu: "100m"
+  #   memory: "0.1Gi"
   requests:
-    cpu: 25m
-    memory: 1152Mi
+    cpu: "25m"
+    memory: "1.1Gi"
 ## Elasticsearch data container's liveness and readiness probes
 ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
 ##

diff --git a/kubernetes/common/elasticsearch/components/master/values.yaml b/kubernetes/common/elasticsearch/components/master/values.yaml
index a2ec7b9..f4ac74e 100644 (file)
--- a/kubernetes/common/elasticsearch/components/master/values.yaml
+++ b/kubernetes/common/elasticsearch/components/master/values.yaml
@@ -108,13 +108,13 @@ resources:
   ## choice for the user. This also increases chances charts run on environments with little
   ## resources, such as Minikube.
   limits:
-    cpu: 250m
-    memory: 1536Mi
-  #   cpu: 100m
-  #   memory: 128Mi
+    cpu: "250m"
+    memory: "1.5Gi"
+  #   cpu: "100m"
+  #   memory: "0.1Gi"
   requests:
-    cpu: 5m
-    memory: 310Mi
+    cpu: "5m"
+    memory: "0.3Gi"
 ## 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 c3352ae..e1c8f72 100644 (file)
--- a/kubernetes/common/elasticsearch/values.yaml
+++ b/kubernetes/common/elasticsearch/values.yaml
@@ -94,11 +94,11 @@ resources:
   ## choice for the user. This also increases chances charts run on environments with little
   ## resources, such as Minikube.
   limits: {}
-  #   cpu: 100m
-  #   memory: 128Mi
+  #   cpu: "100m"
+  #   memory: "0.1Gi"
   requests:
-    cpu: 25m
-    memory: 256Mi
+    cpu: "25m"
+    memory: "0.2Gi"
 ## 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 a517264..64c8b44 100644 (file)
--- a/kubernetes/common/etcd-init/templates/job.yaml
+++ b/kubernetes/common/etcd-init/templates/job.yaml
@@ -47,6 +47,13 @@ spec:
               fieldPath: metadata.namespace
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       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 721bcb7..c9eac92 100644 (file)
--- a/kubernetes/common/etcd-init/values.yaml
+++ b/kubernetes/common/etcd-init/values.yaml
@@ -59,18 +59,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 100m
-      memory: 500Mi
+      cpu: "100m"
+      memory: "0.5Gi"
     requests:
-      cpu: 10m
-      memory: 10Mi
+      cpu: "10m"
+      memory: "0.01Gi"
   large:
     limits:
-      cpu: 200m
-      memory: 500Mi
+      cpu: "200m"
+      memory: "0.5Gi"
     requests:
-      cpu: 20m
-      memory: 20Mi
+      cpu: "20m"
+      memory: "0.02Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index be7ad8e..4a99076 100644 (file)
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -592,18 +592,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: '1'
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 500m
-      memory: 2Gi
+      cpu: "500m"
+      memory: "2Gi"
   large:
     limits:
-      cpu: '2'
-      memory: 6Gi
+      cpu: "2"
+      memory: "6Gi"
     requests:
-      cpu: '1'
-      memory: 3Gi
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 
 ## MariaDB Galera containers' liveness and readiness probes
@@ -668,11 +668,11 @@ metrics:
     # resources, such as Minikube. If you do want to specify resources, uncomment the following
     # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
     limits:
-      cpu: 0.5
-      memory: 256Mi
+      cpu: "0.5"
+      memory: "0.2Gi"
     requests:
-      cpu: 0.5
-      memory: 256Mi
+      cpu: "0.5"
+      memory: "0.2Gi"
   ## 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/templates/job.yaml b/kubernetes/common/mariadb-init/templates/job.yaml
index f41f523..288ea8e 100644 (file)
--- a/kubernetes/common/mariadb-init/templates/job.yaml
+++ b/kubernetes/common/mariadb-init/templates/job.yaml
@@ -51,6 +51,13 @@ spec:
               fieldPath: metadata.namespace
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.image.mariadb" . }}

diff --git a/kubernetes/common/mariadb-init/values.yaml b/kubernetes/common/mariadb-init/values.yaml
index fb2e202..9a4b4b3 100644 (file)
--- a/kubernetes/common/mariadb-init/values.yaml
+++ b/kubernetes/common/mariadb-init/values.yaml
@@ -125,18 +125,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 100m
-      memory: 500Mi
+      cpu: "100m"
+      memory: "0.5Gi"
     requests:
-      cpu: 10m
-      memory: 10Mi
+      cpu: "10m"
+      memory: "0.01Gi"
   large:
     limits:
-      cpu: 200m
-      memory: 500Mi
+      cpu: "200m"
+      memory: "0.5Gi"
     requests:
-      cpu: 20m
-      memory: 20Mi
+      cpu: "20m"
+      memory: "0.02Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/common/mongo/values.yaml b/kubernetes/common/mongo/values.yaml
index caab718..0d098d8 100644 (file)
--- a/kubernetes/common/mongo/values.yaml
+++ b/kubernetes/common/mongo/values.yaml
@@ -101,18 +101,18 @@ ingress:
 resources:
   small:
     limits:
-      cpu: 100m
-      memory: 200Mi
+      cpu: "100m"
+      memory: "0.2Gi"
     requests:
-      cpu: 10m
-      memory: 50Mi
+      cpu: "10m"
+      memory: "0.05Gi"
   large:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 sdnctlPrefix: mongo

diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml
index 1eed35c..010ec0f 100644 (file)
--- a/kubernetes/common/network-name-gen/templates/deployment.yaml
+++ b/kubernetes/common/network-name-gen/templates/deployment.yaml
@@ -43,6 +43,13 @@ spec:
               fieldPath: metadata.namespace
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}
         command:

diff --git a/kubernetes/common/postgres-init/values.yaml b/kubernetes/common/postgres-init/values.yaml
index 5a9f445..7e70019 100644 (file)
--- a/kubernetes/common/postgres-init/values.yaml
+++ b/kubernetes/common/postgres-init/values.yaml
@@ -76,18 +76,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 100m
-      memory: 300Mi
+      cpu: "100m"
+      memory: "0.3Gi"
     requests:
-      cpu: 10m
-      memory: 90Mi
+      cpu: "10m"
+      memory: "0.09Gi"
   large:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/common/postgres/values.yaml b/kubernetes/common/postgres/values.yaml
index 977e7d5..5671f01 100644 (file)
--- a/kubernetes/common/postgres/values.yaml
+++ b/kubernetes/common/postgres/values.yaml
@@ -160,18 +160,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 100m
-      memory: 300Mi
+      cpu: "100m"
+      memory: "0.3Gi"
     requests:
-      cpu: 10m
-      memory: 90Mi
+      cpu: "10m"
+      memory: "0.09Gi"
   large:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 metrics:
@@ -200,11 +200,11 @@ metrics:
     # resources, such as Minikube. If you do want to specify resources, uncomment the following
     # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
     limits:
-      cpu: 0.5
-      memory: 256Mi
+      cpu: "0.5"
+      memory: "0.2Gi"
     requests:
-      cpu: 0.5
-      memory: 256Mi
+      cpu: "0.5"
+      memory: "0.2Gi"
   ## 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 128c505..2fdb613 100644 (file)
--- a/kubernetes/common/readinessCheck/values.yaml
+++ b/kubernetes/common/readinessCheck/values.yaml
@@ -19,8 +19,8 @@ user: 100
 group: 65533
 
 limits:
-  cpu: 100m
-  memory: 100Mi
+  cpu: "100m"
+  memory: "0.5Gi"
 requests:
-  cpu: 3m
-  memory: 20Mi
+  cpu: "3m"
+  memory: "0.02Gi"

diff --git a/kubernetes/common/timescaledb/values.yaml b/kubernetes/common/timescaledb/values.yaml
index 72a4b6f..b4070bb 100644 (file)
--- a/kubernetes/common/timescaledb/values.yaml
+++ b/kubernetes/common/timescaledb/values.yaml
@@ -63,18 +63,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 100m
-      memory: 300Mi
+      cpu: "100m"
+      memory: "0.3Gi"
     requests:
-      cpu: 10m
-      memory: 90Mi
+      cpu: "10m"
+      memory: "0.09Gi"
   large:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 nodeSelector: {}

diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index 91f9e39..9cc6973 100644 (file)
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -109,18 +109,18 @@ replicaCount: 1
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 1.5Gi
+      cpu: "2"
+      memory: "1.5Gi"
     requests:
-      cpu: 1
-      memory: 1.5Gi
+      cpu: "1"
+      memory: "1.5Gi"
   large:
     limits:
-      cpu: 4
-      memory: 3Gi
+      cpu: "4"
+      memory: "3Gi"
     requests:
-      cpu: 2
-      memory: 3Gi
+      cpu: "2"
+      memory: "3Gi"
   unlimited: {}
 # probe configuration parameters
 liveness:

diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index 6eaeb35..e6e0b19 100644 (file)
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -83,18 +83,18 @@ replicaCount: 1
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   large:
     limits:
-      cpu: 4
-      memory: 4Gi
+      cpu: "4"
+      memory: "4Gi"
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
   unlimited: {}
 # probe configuration parameters
 liveness:

diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index c9d5c33..4d4a8ca 100644 (file)
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -84,18 +84,18 @@ replicaCount: 1
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4
-      memory: 2Gi
+      cpu: "4"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 # probe configuration parameters
 liveness:

diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
index cb6e5f7..fa26fb4 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
@@ -207,18 +207,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4
-      memory: 2Gi
+      cpu: "4"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
index 1328a24..695cfd2 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
@@ -81,18 +81,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 0.5Gi
+      cpu: "2"
+      memory: "0.5Gi"
     requests:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 4
-      memory: 1Gi
+      cpu: "4"
+      memory: "1Gi"
     requests:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
index e40b167..74338e6 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
@@ -116,18 +116,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4
-      memory: 2Gi
+      cpu: "4"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
index 691a127..68ded3d 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
@@ -126,18 +126,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4
-      memory: 2Gi
+      cpu: "4"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #################################################################

diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
index 6994e30..c0a1266 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
@@ -136,18 +136,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4
-      memory: 2Gi
+      cpu: "4"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #################################################################

diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
index aa2ac97..2365c17 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
@@ -206,18 +206,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4
-      memory: 2Gi
+      cpu: "4"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
index ed6468a..252a9ab 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
@@ -116,18 +116,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 0.5Gi
+      cpu: "2"
+      memory: "0.5Gi"
     requests:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 4
-      memory: 1Gi
+      cpu: "4"
+      memory: "1Gi"
     requests:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
index 19ca5fd..1ca814e 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
@@ -60,18 +60,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 0.5Gi
+      cpu: "2"
+      memory: "0.5Gi"
     requests:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 4
-      memory: 1Gi
+      cpu: "4"
+      memory: "1Gi"
     requests:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
index 13c46cf..07d15bf 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
@@ -166,18 +166,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4
-      memory: 2Gi
+      cpu: "4"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
index 9b4ffaa..523e31a 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
@@ -139,18 +139,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #################################################################

diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
index 16fd772..09e7e15 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
@@ -146,18 +146,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 3Gi
+      cpu: "1"
+      memory: "3Gi"
     requests:
-      cpu: 0.5
-      memory: 3Gi
+      cpu: "0.5"
+      memory: "3Gi"
   large:
     limits:
-      cpu: 2
-      memory: 6Gi
+      cpu: "2"
+      memory: "6Gi"
     requests:
-      cpu: 1
-      memory: 6Gi
+      cpu: "1"
+      memory: "6Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
index 0a9203b..b20eeb1 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
@@ -156,18 +156,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
index 45e84b9..b648b56 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
@@ -198,18 +198,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   large:
     limits:
-      cpu: 4
-      memory: 4Gi
+      cpu: "4"
+      memory: "4Gi"
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
   unlimited: {}
 
 #################################################################

diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
index ab768ef..bb30086 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
@@ -128,18 +128,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
index 2093c2c..ff4c9bf 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
@@ -207,18 +207,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4
-      memory: 2Gi
+      cpu: "4"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #################################################################

diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
index e0e84a5..e2e4451 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
@@ -161,18 +161,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
index 67b8824..8e83cf6 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
@@ -273,18 +273,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 1.5Gi
+      cpu: "2"
+      memory: "1.5Gi"
     requests:
-      cpu: 1
-      memory: 1.5Gi
+      cpu: "1"
+      memory: "1.5Gi"
   large:
     limits:
-      cpu: 4
-      memory: 3Gi
+      cpu: "4"
+      memory: "3Gi"
     requests:
-      cpu: 2
-      memory: 3Gi
+      cpu: "2"
+      memory: "3Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
index 79581ad..6394591 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
@@ -177,18 +177,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
index 295fcfe..649b87e 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
@@ -53,18 +53,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 0.5Gi
+      cpu: "2"
+      memory: "0.5Gi"
     requests:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 4
-      memory: 1Gi
+      cpu: "4"
+      memory: "1Gi"
     requests:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
index 9b85e7b..632163b 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
@@ -101,18 +101,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
index 0ec3176..c13ba57 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
@@ -127,18 +127,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Security Context

diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index 7361869..ab6a31e 100644 (file)
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -96,18 +96,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: "4"
+      memory: "8Gi"
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/helm/starters/onap-app/values.yaml b/kubernetes/helm/starters/onap-app/values.yaml
index 702bfb2..eef745d 100644 (file)
--- a/kubernetes/helm/starters/onap-app/values.yaml
+++ b/kubernetes/helm/starters/onap-app/values.yaml
@@ -85,8 +85,8 @@ resources: {}
   # Minimum memory for production is 4 CPU cores and 8GB memory
 #resources:
 #  limits:
-#    cpu: 2
-#    memory: 4Gi
+#    cpu: "2"
+#    memory: "4Gi"
 #  requests:
-#    cpu: 2
-#    memory: 4Gi
+#    cpu: "2"
+#    memory: "4Gi"

diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
index 3e26ad4..1df27d4 100644 (file)
--- a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
@@ -108,18 +108,18 @@ readiness:
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 readinessCheck:

diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
index bebd411..54b37cb 100644 (file)
--- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
@@ -120,18 +120,18 @@ readiness:
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}
 
 readinessCheck:

diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
index 9e1dcdd..52f9475 100644 (file)
--- a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
@@ -57,6 +57,13 @@ spec:
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-job-readiness
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       {{ if .Values.config.msb_enabled }}
       {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for.msb ) | indent 6 | trim }}
       {{ end }}

diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
index ddd82c9..fc30677 100644 (file)
--- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
@@ -180,18 +180,18 @@ ingress:
 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: {}
 
 #Pods Service Account

diff --git a/kubernetes/msb/components/kube2msb/templates/deployment.yaml b/kubernetes/msb/components/kube2msb/templates/deployment.yaml
index d03b67b..3767714 100644 (file)
--- a/kubernetes/msb/components/kube2msb/templates/deployment.yaml
+++ b/kubernetes/msb/components/kube2msb/templates/deployment.yaml
@@ -52,6 +52,13 @@ spec:
         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" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/msb/components/kube2msb/values.yaml b/kubernetes/msb/components/kube2msb/values.yaml
index 508e67a..b857134 100644 (file)
--- a/kubernetes/msb/components/kube2msb/values.yaml
+++ b/kubernetes/msb/components/kube2msb/values.yaml
@@ -55,16 +55,16 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
     requests:
-      cpu: 0.5
-      memory: 0.5Gi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}

diff --git a/kubernetes/msb/components/msb-consul/values.yaml b/kubernetes/msb/components/msb-consul/values.yaml
index 98e23d9..c29bb98 100644 (file)
--- a/kubernetes/msb/components/msb-consul/values.yaml
+++ b/kubernetes/msb/components/msb-consul/values.yaml
@@ -69,18 +69,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
     requests:
-      cpu: 0.5
-      memory: 0.5Gi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}
 
 securityContext:

diff --git a/kubernetes/msb/components/msb-discovery/templates/deployment.yaml b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
index 646189a..b09d2fd 100644 (file)
--- a/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
@@ -51,6 +51,13 @@ spec:
         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" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/msb/components/msb-discovery/values.yaml b/kubernetes/msb/components/msb-discovery/values.yaml
index 556c925..cb97f5e 100644 (file)
--- a/kubernetes/msb/components/msb-discovery/values.yaml
+++ b/kubernetes/msb/components/msb-discovery/values.yaml
@@ -69,18 +69,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
     requests:
-      cpu: 0.5
-      memory: 0.5Gi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/msb/components/msb-eag/templates/deployment.yaml b/kubernetes/msb/components/msb-eag/templates/deployment.yaml
index ee6db2d..abc6228 100644 (file)
--- a/kubernetes/msb/components/msb-eag/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-eag/templates/deployment.yaml
@@ -38,6 +38,13 @@ spec:
         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" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/msb/components/msb-eag/values.yaml b/kubernetes/msb/components/msb-eag/values.yaml
index d07ea3d..23769a1 100644 (file)
--- a/kubernetes/msb/components/msb-eag/values.yaml
+++ b/kubernetes/msb/components/msb-eag/values.yaml
@@ -76,18 +76,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
     requests:
-      cpu: 0.5
-      memory: 0.5Gi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/msb/components/msb-iag/templates/deployment.yaml b/kubernetes/msb/components/msb-iag/templates/deployment.yaml
index ee6db2d..abc6228 100644 (file)
--- a/kubernetes/msb/components/msb-iag/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-iag/templates/deployment.yaml
@@ -38,6 +38,13 @@ spec:
         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" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/msb/components/msb-iag/values.yaml b/kubernetes/msb/components/msb-iag/values.yaml
index 807419e..0497fc4 100644 (file)
--- a/kubernetes/msb/components/msb-iag/values.yaml
+++ b/kubernetes/msb/components/msb-iag/values.yaml
@@ -76,18 +76,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
     requests:
-      cpu: 0.5
-      memory: 0.5Gi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
index 0e44668..f6adfba 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
@@ -98,18 +98,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 10m
-      memory: 1Gi
+      cpu: "10m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 20m
-      memory: 2Gi
+      cpu: "20m"
+      memory: "2Gi"
   unlimited: {}
 
 # rabbit-mq image resource

diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index fd45741..1804b70 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -107,18 +107,18 @@ mongo:
   resources: &storage_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 chart overrides for k8splugin
@@ -151,18 +151,18 @@ flavor: large
 resources:
   small:
     limits:
-      cpu: 200m
-      memory: 500Mi
+      cpu: "200m"
+      memory: "0.5Gi"
     requests:
-      cpu: 10m
-      memory: 10Mi
+      cpu: "10m"
+      memory: "0.01Gi"
   large:
     limits:
-      cpu: 400m
-      memory: 1Gi
+      cpu: "400m"
+      memory: "1Gi"
     requests:
-      cpu: 10m
-      memory: 100Mi
+      cpu: "10m"
+      memory: "0.1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/multicloud/components/multicloud-pike/values.yaml b/kubernetes/multicloud/components/multicloud-pike/values.yaml
index 2b84873..643daa7 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-pike/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/values.yaml
@@ -94,18 +94,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 10m
-      memory: 1Gi
+      cpu: "10m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 20m
-      memory: 2Gi
+      cpu: "20m"
+      memory: "2Gi"
   unlimited: {}
 
 # memcached image resource

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml
index ccd70b3..5b48f73 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml
@@ -72,16 +72,16 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 10m
-      memory: 1Gi
+      cpu: "10m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 20m
-      memory: 2Gi
+      cpu: "20m"
+      memory: "2Gi"
   unlimited: {}

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml
index 43f4e93..0d066bb 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml
@@ -99,16 +99,16 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 10m
-      memory: 1Gi
+      cpu: "10m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 20m
-      memory: 2Gi
+      cpu: "20m"
+      memory: "2Gi"
   unlimited: {}

diff --git a/kubernetes/multicloud/components/multicloud-prometheus/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/values.yaml
index 2726049..20ab052 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-prometheus/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/values.yaml
@@ -87,18 +87,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 10m
-      memory: 1Gi
+      cpu: "10m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 20m
-      memory: 2Gi
+      cpu: "20m"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
index 22a0c71..2f06b4b 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
@@ -97,18 +97,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 10m
-      memory: 1Gi
+      cpu: "10m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 20m
-      memory: 2Gi
+      cpu: "20m"
+      memory: "2Gi"
   unlimited: {}
 
 # memcached image resource

diff --git a/kubernetes/multicloud/components/multicloud-vio/values.yaml b/kubernetes/multicloud/components/multicloud-vio/values.yaml
index 537bc8e..1337362 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-vio/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/values.yaml
@@ -95,18 +95,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 10m
-      memory: 1Gi
+      cpu: "10m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 20m
-      memory: 2Gi
+      cpu: "20m"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/multicloud/components/multicloud-windriver/values.yaml b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
index 9ede0c3..0af9df8 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
@@ -115,18 +115,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 10m
-      memory: 1Gi
+      cpu: "10m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 20m
-      memory: 2Gi
+      cpu: "20m"
+      memory: "2Gi"
   unlimited: {}
 
 # memcached image resource

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 0f5ede8..033826f 100644 (file)
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -125,18 +125,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 10m
-      memory: 1Gi
+      cpu: "10m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 20m
-      memory: 2Gi
+      cpu: "20m"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index 49c0592..5a0b2a0 100644 (file)
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -157,18 +157,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4
-      memory: 2Gi
+      cpu: "4"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/onap/resources/environments/core-onap.yaml b/kubernetes/onap/resources/environments/core-onap.yaml
index 20da477..ea9b15e 100644 (file)
--- a/kubernetes/onap/resources/environments/core-onap.yaml
+++ b/kubernetes/onap/resources/environments/core-onap.yaml
@@ -96,11 +96,11 @@ sdc:
     resources:
       small:
         limits:
-          cpu: 1
-          memory: 2Gi
+          cpu: "1"
+          memory: "2Gi"
         requests:
-          cpu: 10m
-          memory: 500Mi
+          cpu: "10m"
+          memory: "0.5Gi"
   sdc-cs:
     config:
       maxHeapSize: "512M"

diff --git a/kubernetes/onap/resources/environments/minimal-onap.yaml b/kubernetes/onap/resources/environments/minimal-onap.yaml
index ba30110..11bc653 100644 (file)
--- a/kubernetes/onap/resources/environments/minimal-onap.yaml
+++ b/kubernetes/onap/resources/environments/minimal-onap.yaml
@@ -85,11 +85,11 @@ robot:
   resources:
     small:
       limits:
-        cpu: 1
-        memory: 2Gi
+        cpu: "1"
+        memory: "2Gi"
       requests:
-        cpu: 10m
-        memory: 100Mi
+        cpu: "10m"
+        memory: "0.1Gi"
 sdc:
   enabled: true
   sdc-be:
@@ -99,11 +99,11 @@ sdc:
     resources:
       small:
         limits:
-          cpu: 1
-          memory: 2Gi
+          cpu: "1"
+          memory: "2Gi"
         requests:
-          cpu: 10m
-          memory: 500Mi
+          cpu: "10m"
+          memory: "0.5Gi"
   sdc-cs:
     config:
       maxHeapSize: "512M"

diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml
index cda4045..9cd417d 100644 (file)
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -104,11 +104,11 @@ sdc:
     resources:
       small:
         limits:
-          cpu: 1
-          memory: 2Gi
+          cpu: "1"
+          memory: "2Gi"
         requests:
-          cpu: 10m
-          memory: 500Mi
+          cpu: "10m"
+          memory: "0.5Gi"
   sdc-cs:
     config:
       maxHeapSize: "512M"

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 1dc9cf6..74efe9c 100755 (executable)
--- 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 0f02693..7cbfafb 100755 (executable)
--- 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 d557f05..37e131b 100755 (executable)
--- 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 812a4e6..6a1bc53 100755 (executable)
--- 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 31a065f..e0a9b0c 100755 (executable)
--- 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 2924ce8..d528677 100755 (executable)
--- 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:

diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index ddff8f4..afae1f1 100644 (file)
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -99,18 +99,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
 
   unlimited: {}
 # probe configuration parameters

diff --git a/kubernetes/platform/components/chartmuseum/values.yaml b/kubernetes/platform/components/chartmuseum/values.yaml
index de3892c..3367083 100644 (file)
--- a/kubernetes/platform/components/chartmuseum/values.yaml
+++ b/kubernetes/platform/components/chartmuseum/values.yaml
@@ -82,16 +82,16 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
     requests:
-      cpu: 0.5
-      memory: 0.5Gi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}
\ No newline at end of file

diff --git a/kubernetes/platform/components/cmpv2-cert-provider/values.yaml b/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
index e387cc8..7645ccd 100644 (file)
--- a/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
@@ -35,11 +35,11 @@ deployment:
   logLevel: debug
   resources:
     limits:
-      cpu: 250m
-      memory: 128Mi
+      cpu: "250m"
+      memory: "0.1Gi"
     requests:
-      cpu: 100m
-      memory: 64Mi
+      cpu: "100m"
+      memory: "0.06Gi"
 readinessCheck:
   wait_for:
     - oom-cert-service

diff --git a/kubernetes/platform/components/keycloak-init/components/keycloak-config-cli/values.yaml b/kubernetes/platform/components/keycloak-init/components/keycloak-config-cli/values.yaml
index 46c67dd..5f8d4a3 100644 (file)
--- a/kubernetes/platform/components/keycloak-init/components/keycloak-config-cli/values.yaml
+++ b/kubernetes/platform/components/keycloak-init/components/keycloak-config-cli/values.yaml
@@ -47,10 +47,10 @@ labels: {}
 resources: {}
   # limits:
   #   cpu: "100m"
-  #   memory: "1024Mi"
+  #   memory: "1Gi"
   # requests:
   #   cpu: "100m"
-#   memory: "1024Mi"
+#   memory: "1Gi"
 
 env:
   KEYCLOAK_URL: http://keycloak:8080

diff --git a/kubernetes/platform/components/oauth2-proxy/components/oauth2-proxy/values.yaml b/kubernetes/platform/components/oauth2-proxy/components/oauth2-proxy/values.yaml
index 7e5f939..6b56132 100644 (file)
--- a/kubernetes/platform/components/oauth2-proxy/components/oauth2-proxy/values.yaml
+++ b/kubernetes/platform/components/oauth2-proxy/components/oauth2-proxy/values.yaml
@@ -164,11 +164,11 @@ ingress:
 
 resources: {}
   # limits:
-  #   cpu: 100m
-  #   memory: 300Mi
+  #   cpu: "100m"
+  #   memory: "0.3Gi"
   # requests:
-  #   cpu: 100m
-  #   memory: 300Mi
+  #   cpu: "100m"
+  #   memory: "0.3Gi"
 
 extraVolumes: []
   # - name: ca-bundle-cert

diff --git a/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml b/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml
index 5f80a7d..0ae9766 100644 (file)
--- a/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml
+++ b/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml
@@ -67,6 +67,13 @@ spec:
                 fieldPath: metadata.namespace
           image: {{ include "repositoryGenerator.image.readiness" . }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          resources:
+            limits:
+              cpu: "100m"
+              memory: "0.5Gi"
+            requests:
+              cpu: "3m"
+              memory: "0.02Gi"
         - name: subsitute-envs
           image: {{ include "repositoryGenerator.image.envsubst" . }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}

diff --git a/kubernetes/platform/components/oom-cert-service/values.yaml b/kubernetes/platform/components/oom-cert-service/values.yaml
index c1a75ae..37ad335 100644 (file)
--- a/kubernetes/platform/components/oom-cert-service/values.yaml
+++ b/kubernetes/platform/components/oom-cert-service/values.yaml
@@ -61,18 +61,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
     requests:
-      cpu: 0.5
-      memory: 0.5Gi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}
 
 

diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml
index d61ff6f..10fb9f6 100755 (executable)
--- a/kubernetes/policy/components/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml
@@ -101,18 +101,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/policy/components/policy-api/templates/deployment.yaml b/kubernetes/policy/components/policy-api/templates/deployment.yaml
index 1d7e049..e7e8e52 100755 (executable)
--- a/kubernetes/policy/components/policy-api/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-api/templates/deployment.yaml
@@ -26,6 +26,13 @@ spec:
           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"
         - command:
           - sh
           args:

diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml
index 0f54144..9378c05 100755 (executable)
--- a/kubernetes/policy/components/policy-api/values.yaml
+++ b/kubernetes/policy/components/policy-api/values.yaml
@@ -111,18 +111,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
index b6815df..7ab6f7d 100755 (executable)
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
@@ -104,18 +104,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 #Pods Service Account
 serviceAccount:

diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
index 58f7954..e65821b 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
@@ -94,18 +94,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 #Pods Service Account
 serviceAccount:

diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
index ef3c384..d3b2c86 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
@@ -95,18 +95,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
index 633bb68..b7e5144 100755 (executable)
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
@@ -94,18 +94,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.7Gi
+      cpu: "1"
+      memory: "0.7Gi"
     requests:
-      cpu: 0.5
-      memory: 0.7Gi
+      cpu: "0.5"
+      memory: "0.7Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1.4Gi
+      cpu: "2"
+      memory: "1.4Gi"
     requests:
-      cpu: 1
-      memory: 1.4Gi
+      cpu: "1"
+      memory: "1.4Gi"
   unlimited: {}
 #Pods Service Account
 serviceAccount:

diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
index 1f23112..eeb7c18 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
@@ -115,18 +115,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 #Pods Service Account
 serviceAccount:

diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
index 27bc013..7b6b985 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
@@ -45,6 +45,13 @@ spec:
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-galera-config-readiness
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       - command:
         - sh
         args:

diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
index b1aadcd..aa908f4 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
@@ -129,18 +129,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml
index ca9b887..5f35205 100755 (executable)
--- a/kubernetes/policy/components/policy-distribution/values.yaml
+++ b/kubernetes/policy/components/policy-distribution/values.yaml
@@ -127,18 +127,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
     requests:
-      cpu: 0.5
-      memory: 0.5Gi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
index 4ce90da..c483b5f 100755 (executable)
--- a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
@@ -40,6 +40,13 @@ spec:
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-db-readiness
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
 {{- if not .Values.nexus.offline }}
       - command:
         - /app/ready.py
@@ -55,6 +62,13 @@ spec:
         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"
 {{- end }}
       containers:
         - name: {{ include "common.name" . }}

diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index fe94cd7..8ae5e5b 100755 (executable)
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -157,18 +157,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.8Gi
+      cpu: "1"
+      memory: "0.8Gi"
     requests:
-      cpu: 0.5
-      memory: 0.8Gi
+      cpu: "0.5"
+      memory: "0.8Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1.6Gi
+      cpu: "2"
+      memory: "1.6Gi"
     requests:
-      cpu: 1
-      memory: 1.6Gi
+      cpu: "1"
+      memory: "1.6Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/policy/components/policy-gui/templates/deployment.yaml b/kubernetes/policy/components/policy-gui/templates/deployment.yaml
index 69b5e37..f175777 100644 (file)
--- a/kubernetes/policy/components/policy-gui/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-gui/templates/deployment.yaml
@@ -58,6 +58,13 @@ spec:
         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:
         # side car containers
         {{ if .Values.global.centralizedLoggingEnabled }}{{ include "common.log.sidecar" . | nindent 8 }}{{ end }}

diff --git a/kubernetes/policy/components/policy-gui/values.yaml b/kubernetes/policy/components/policy-gui/values.yaml
index aeccf3a..deffed8 100644 (file)
--- a/kubernetes/policy/components/policy-gui/values.yaml
+++ b/kubernetes/policy/components/policy-gui/values.yaml
@@ -109,18 +109,18 @@ serviceMesh:
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.7Gi
+      cpu: "1"
+      memory: "0.7Gi"
     requests:
-      cpu: 0.5
-      memory: 0.7Gi
+      cpu: "0.5"
+      memory: "0.7Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1.4Gi
+      cpu: "2"
+      memory: "1.4Gi"
     requests:
-      cpu: 1
-      memory: 1.4Gi
+      cpu: "1"
+      memory: "1.4Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/policy/components/policy-nexus/values.yaml b/kubernetes/policy/components/policy-nexus/values.yaml
index 81456c5..f9cb108 100755 (executable)
--- a/kubernetes/policy/components/policy-nexus/values.yaml
+++ b/kubernetes/policy/components/policy-nexus/values.yaml
@@ -83,18 +83,18 @@ resources:
   flavor: small
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 1m
-      memory: 0.5Gi
+      cpu: "1m"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 2m
-      memory: 1Gi
+      cpu: "2m"
+      memory: "1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/policy/components/policy-pap/templates/deployment.yaml b/kubernetes/policy/components/policy-pap/templates/deployment.yaml
index 7890772..5ff3062 100755 (executable)
--- a/kubernetes/policy/components/policy-pap/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-pap/templates/deployment.yaml
@@ -49,6 +49,13 @@ spec:
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-db-readiness
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       - command:
         - sh
         args:

diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index ecd78b5..9e05c47 100755 (executable)
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -146,18 +146,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
index 1bd94ee..f3cccff 100755 (executable)
--- a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml
@@ -42,6 +42,13 @@ spec:
         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"
       - command:
         - sh
         args:

diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index d4c20cc..8ce1b96 100755 (executable)
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -131,18 +131,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/policy/templates/job.yaml b/kubernetes/policy/templates/job.yaml
index 8161bc1..442314c 100755 (executable)
--- a/kubernetes/policy/templates/job.yaml
+++ b/kubernetes/policy/templates/job.yaml
@@ -49,6 +49,13 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}-galera-config
         image: {{ include "repositoryGenerator.image.mariadb" . }}
@@ -201,20 +208,27 @@ spec:
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
       initContainers:
-        - name: {{ include "common.name" . }}-init-readiness
-          image: {{ include "repositoryGenerator.image.readiness" . }}
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          command:
-          - /app/ready.py
-          args:
-          - --job-name
-          - {{ include "common.fullname" . }}-galera-init
-          env:
-          - name: NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
+      - name: {{ include "common.name" . }}-init-readiness
+        image: {{ include "repositoryGenerator.image.readiness" . }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        command:
+        - /app/ready.py
+        args:
+        - --job-name
+        - {{ include "common.fullname" . }}-galera-init
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}-galera-db-migrator
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.dbmigrator.image }}
@@ -293,20 +307,27 @@ spec:
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
       initContainers:
-        - name: {{ include "common.name" . }}-init-readiness
-          image: {{ include "repositoryGenerator.image.readiness" . }}
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          command:
-          - /app/ready.py
-          args:
-          - --job-name
-          - {{ include "common.fullname" . }}-pg-init
-          env:
-          - name: NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
+      - name: {{ include "common.name" . }}-init-readiness
+        image: {{ include "repositoryGenerator.image.readiness" . }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        command:
+        - /app/ready.py
+        args:
+        - --job-name
+        - {{ include "common.fullname" . }}-pg-init
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}-pg-db-migrator
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.dbmigrator.image }}

diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 5628ade..bcb8746 100755 (executable)
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -288,18 +288,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 100m
-      memory: 1Gi
+      cpu: "100m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 200m
-      memory: 2Gi
+      cpu: "200m"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index 1cd9db9..6025462 100644 (file)
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -382,18 +382,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2000m
-      memory: 4Gi
+      cpu: "2000m"
+      memory: "4Gi"
     requests:
-      cpu: 500m
-      memory: 1Gi
+      cpu: "500m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4000m
-      memory: 8Gi
+      cpu: "4000m"
+      memory: "8Gi"
     requests:
-      cpu: 1000m
-      memory: 2Gi
+      cpu: "1000m"
+      memory: "2Gi"
   unlimited: {}
 
 # probe configuration parameters

diff --git a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
index 010c296..7c1d4a4 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
@@ -45,11 +45,11 @@ spec:
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         resources:
           limits:
-            cpu: 100m
-            memory: 100Mi
+            cpu: "100m"
+            memory: "0.5Gi"
           requests:
-            cpu: 3m
-            memory: 20Mi
+            cpu: "3m"
+            memory: "0.02Gi"
       - name: {{ include "common.name" . }}-job-completion
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: "{{ .Values.global.pullPolicy | default .Values.pullPolicy }}"
@@ -66,11 +66,11 @@ spec:
               fieldPath: metadata.namespace
         resources:
           limits:
-            cpu: 100m
-            memory: 100Mi
+            cpu: "100m"
+            memory: "0.5Gi"
           requests:
-            cpu: 3m
-            memory: 20Mi
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/sdc/components/sdc-be/templates/job.yaml b/kubernetes/sdc/components/sdc-be/templates/job.yaml
index 5d50ab3..bdb6821 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/job.yaml
@@ -48,11 +48,11 @@ spec:
               fieldPath: metadata.namespace
         resources:
           limits:
-            cpu: 100m
-            memory: 100Mi
+            cpu: "100m"
+            memory: "0.5Gi"
           requests:
-            cpu: 3m
-            memory: 20Mi
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.backendInitImage }}
@@ -71,11 +71,11 @@ spec:
               fieldPath: status.podIP
         resources:
           limits:
-            cpu: 800m
-            memory: 1024Mi
+            cpu: "800m"
+            memory: "1Gi"
           requests:
-            cpu: 200m
-            memory: 200Mi
+            cpu: "200m"
+            memory: "0.2Gi"
       {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:

diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index 074a166..7f914d4 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -155,18 +155,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 3Gi
+      cpu: "1"
+      memory: "3Gi"
     requests:
-      cpu: 0.5
-      memory: 3Gi
+      cpu: "0.5"
+      memory: "3Gi"
   large:
     limits:
-      cpu: 2
-      memory: 6Gi
+      cpu: "2"
+      memory: "6Gi"
     requests:
-      cpu: 1
-      memory: 6Gi
+      cpu: "1"
+      memory: "6Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/sdc/components/sdc-cs/templates/job.yaml b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
index 3738ff4..6e9169d 100644 (file)
--- a/kubernetes/sdc/components/sdc-cs/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
@@ -50,11 +50,11 @@ spec:
               fieldPath: metadata.namespace
         resources:
           limits:
-            cpu: 100m
-            memory: 100Mi
+            cpu: "100m"
+            memory: "0.5Gi"
           requests:
-            cpu: 3m
-            memory: 20Mi
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.cassandraInitImage }}
@@ -86,11 +86,11 @@ spec:
               fieldPath: status.podIP
         resources:
           limits:
-            cpu: 800m
-            memory: 1024Mi
+            cpu: "800m"
+            memory: "1Gi"
           requests:
-            cpu: 200m
-            memory: 300Mi
+            cpu: "200m"
+            memory: "0.3Gi"
       {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:

diff --git a/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml b/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml
index 6bebe6f..f40ada0 100644 (file)
--- a/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-fe/templates/deployment.yaml
@@ -44,11 +44,11 @@ spec:
               fieldPath: metadata.namespace
         resources:
           limits:
-            cpu: 100m
-            memory: 100Mi
+            cpu: "100m"
+            memory: "0.5Gi"
           requests:
-            cpu: 3m
-            memory: 20Mi
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml
index 7c99757..5745f06 100644 (file)
--- a/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@ -122,18 +122,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/sdc/components/sdc-helm-validator/values.yaml b/kubernetes/sdc/components/sdc-helm-validator/values.yaml
index 39f9a91..84a6abe 100644 (file)
--- a/kubernetes/sdc/components/sdc-helm-validator/values.yaml
+++ b/kubernetes/sdc/components/sdc-helm-validator/values.yaml
@@ -58,16 +58,16 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
     requests:
-      cpu: 0.5
-      memory: 0.5Gi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}

diff --git a/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
index 6c392ef..4bab631 100644 (file)
--- a/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
@@ -42,11 +42,11 @@ spec:
               fieldPath: metadata.namespace
         resources:
           limits:
-            cpu: 100m
-            memory: 100Mi
+            cpu: "100m"
+            memory: "0.5Gi"
           requests:
-            cpu: 3m
-            memory: 20Mi
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
index eb0958c..4cef90b 100644 (file)
--- a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
@@ -46,11 +46,11 @@ spec:
               fieldPath: metadata.namespace
         resources:
           limits:
-            cpu: 100m
-            memory: 100Mi
+            cpu: "100m"
+            memory: "0.5Gi"
           requests:
-            cpu: 3m
-            memory: 20Mi
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.onboardingInitImage }}
@@ -87,11 +87,11 @@ spec:
           value: "{{ .Values.global.sdc_cassandra.serviceName }}"
         resources:
           limits:
-            cpu: 800m
-            memory: 1024Mi
+            cpu: "800m"
+            memory: "1Gi"
           requests:
-            cpu: 200m
-            memory: 200Mi
+            cpu: "200m"
+            memory: "0.2Gi"
       {{ include "common.waitForJobContainer" . | indent 6 | trim }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:

diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index 81d6373..a555656 100644 (file)
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -131,18 +131,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1.5Gi
+      cpu: "1"
+      memory: "1.5Gi"
     requests:
-      cpu: 0.5
-      memory: 1.5Gi
+      cpu: "0.5"
+      memory: "1.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 3Gi
+      cpu: "2"
+      memory: "3Gi"
     requests:
-      cpu: 1
-      memory: 3Gi
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
index da62035..910cf1b 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
@@ -43,11 +43,11 @@ spec:
               fieldPath: metadata.namespace
         resources:
           limits:
-            cpu: 100m
-            memory: 100Mi
+            cpu: "100m"
+            memory: "0.5Gi"
           requests:
-            cpu: 3m
-            memory: 20Mi
+            cpu: "3m"
+            memory: "0.02Gi"
       {{ end }}
       containers:
         - name: {{ include "common.name" . }}

diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
index fc8b8fa..de90704 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
@@ -47,11 +47,11 @@ spec:
                 fieldPath: metadata.namespace
           resources:
             limits:
-              cpu: 100m
-              memory: 100Mi
+              cpu: "100m"
+              memory: "0.5Gi"
             requests:
-              cpu: 3m
-              memory: 20Mi
+              cpu: "3m"
+              memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}-job
         image:

diff --git a/kubernetes/sdc/components/sdc-wfd-be/values.yaml b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
index aedf620..cc85176 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
@@ -130,18 +130,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml b/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
index b667af2..e750143 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
@@ -40,11 +40,11 @@ spec:
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         resources:
           limits:
-            cpu: 100m
-            memory: 100Mi
+            cpu: "100m"
+            memory: "0.5Gi"
           requests:
-            cpu: 3m
-            memory: 20Mi
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/sdc/components/sdc-wfd-fe/values.yaml b/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
index 3c6645c..e33cf48 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
@@ -114,18 +114,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml b/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
index 03c5463..25f4033 100644 (file)
--- a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
@@ -65,6 +65,13 @@ spec:
         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:
       - command:
         - /opt/onap/sdnc/dmaap-listener/bin/start-dmaap-listener.sh

diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml
index 12bbdf0..084afa1 100644 (file)
--- a/kubernetes/sdnc/components/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml
@@ -129,18 +129,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml
index 6bbb60c..b5c2a8e 100644 (file)
--- a/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml
@@ -61,6 +61,13 @@ spec:
         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: ["/bin/bash"]

diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
index e0e4c22..5a6b755 100644 (file)
--- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
@@ -126,18 +126,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
     requests:
-      cpu: 0.5
-      memory: 0.5Gi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml
index 4e3b8cf..7443f69 100644 (file)
--- a/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml
@@ -40,6 +40,13 @@ spec:
         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" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/sdnc/components/sdnc-prom/values.yaml b/kubernetes/sdnc/components/sdnc-prom/values.yaml
index a1c0b1b..e2f3b34 100644 (file)
--- a/kubernetes/sdnc/components/sdnc-prom/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/values.yaml
@@ -96,18 +96,18 @@ ingress:
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
     requests:
-      cpu: 0.5
-      memory: 0.5Gi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
index c99855d..4e16fcf 100644 (file)
--- a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
@@ -38,6 +38,13 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
 
       containers:
         - name: {{ include "common.name" . }}

diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml
index 7913dd4..265068b 100644 (file)
--- a/kubernetes/sdnc/components/sdnc-web/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/values.yaml
@@ -93,18 +93,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 0.5Gi
+      cpu: "1"
+      memory: "0.5Gi"
     requests:
-      cpu: 0.5
-      memory: 0.5Gi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
index 0ca1601..8c19a21 100644 (file)
--- a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
@@ -70,6 +70,13 @@ spec:
         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:
       - command:
         - /opt/onap/sdnc/ueb-listener/bin/start-ueb-listener.sh

diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml
index 399305f..bccb1d7 100644 (file)
--- a/kubernetes/sdnc/components/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/values.yaml
@@ -149,18 +149,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml
index afe0e72..451c5b0 100755 (executable)
--- a/kubernetes/sdnc/templates/job.yaml
+++ b/kubernetes/sdnc/templates/job.yaml
@@ -90,6 +90,13 @@ spec:
               fieldPath: metadata.namespace
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
index e42757e..7e73f9d 100755 (executable)
--- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
+++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
@@ -46,6 +46,13 @@ spec:
               fieldPath: metadata.namespace
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}-sdnrdb-init-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 4607b62..ac34d2c 100644 (file)
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -156,6 +156,13 @@ spec:
         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"
         {{ end }}
       - name: {{ include "common.name" . }}-chown
         image: {{ include "repositoryGenerator.image.busybox" . }}

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 72eb138..55f6a1d 100644 (file)
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -667,18 +667,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4.7Gi
+      cpu: "2"
+      memory: "4.7Gi"
     requests:
-      cpu: 1
-      memory: 4.7Gi
+      cpu: "1"
+      memory: "4.7Gi"
   large:
     limits:
-      cpu: 4
-      memory: 9.4Gi
+      cpu: "4"
+      memory: "9.4Gi"
     requests:
-      cpu: 2
-      memory: 9.4Gi
+      cpu: "2"
+      memory: "9.4Gi"
   unlimited: {}
 
 #Pods Service Account

diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index 2da7dd0..c10b509 100644 (file)
--- a/kubernetes/so/components/so-admin-cockpit/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -121,18 +121,18 @@ flavor: small
 resources:
   small:
     requests:
-      memory: 1Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1Gi"
     limits:
-      memory: 4Gi
-      cpu: 1
+      cpu: "1"
+      memory: "4Gi"
   large:
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
     limits:
-      memory: 8Gi
-      cpu: 2
+      cpu: "2"
+      memory: "8Gi"
   unlimited: {}
 readinessProbe:
   port: 9091

diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index f47d142..f871e0f 100755 (executable)
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -146,18 +146,18 @@ flavor: large
 resources:
   small:
     limits:
-      memory: 3Gi
-      cpu: 1
+      cpu: "1"
+      memory: "3Gi"
     requests:
-      memory: 3Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "3Gi"
   large:
     limits:
-      memory: 6Gi
-      cpu: 2
+      cpu: "2"
+      memory: "6Gi"
     requests:
-      memory: 6Gi
-      cpu: 1
+      cpu: "1"
+      memory: "6Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health

diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
index da4f9c6..5a5325f 100755 (executable)
--- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
@@ -108,18 +108,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 1.5Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1.5Gi"
     requests:
-      memory: 1.5Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1.5Gi"
   large:
     limits:
-      memory: 3Gi
-      cpu: 2
+      cpu: "2"
+      memory: "3Gi"
     requests:
-      memory: 3Gi
-      cpu: 1
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health

diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index f11a961..32f8727 100755 (executable)
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -130,18 +130,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: {}
 livenessProbe:
   path: /manage/health

diff --git a/kubernetes/so/components/so-cnfm-lcm/values.yaml b/kubernetes/so/components/so-cnfm-lcm/values.yaml
index 0a85a10..9a85ec8 100644 (file)
--- a/kubernetes/so/components/so-cnfm-lcm/values.yaml
+++ b/kubernetes/so/components/so-cnfm-lcm/values.yaml
@@ -103,18 +103,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 4Gi
-      cpu: 2000m
+      cpu: "2000m"
+      memory: "4Gi"
     requests:
-      memory: 1Gi
-      cpu: 500m
+      cpu: "500m"
+      memory: "1Gi"
   large:
     limits:
-      memory: 8Gi
-      cpu: 4000m
+      cpu: "4000m"
+      memory: "8Gi"
     requests:
-      memory: 2Gi
-      cpu: 1000m
+      cpu: "1000m"
+      memory: "2Gi"
   unlimited: {}
 
 livenessProbe:

diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
index 48e923c..dc6f2b7 100644 (file)
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -127,18 +127,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: 5Gi
-      cpu: 2
+      cpu: "2"
+      memory: "5Gi"
     requests:
-      memory: 2Gi
-      cpu: 1
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 livenessProbe:

diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
index ca4e787..bea0a28 100755 (executable)
--- a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
@@ -86,18 +86,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: {}
 livenessProbe:
   port: 9092

diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
index 0d06ed7..2b219d0 100755 (executable)
--- a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
@@ -104,18 +104,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: {}
 livenessProbe:
   path: /manage/health

diff --git a/kubernetes/so/components/so-mariadb/templates/job.yaml b/kubernetes/so/components/so-mariadb/templates/job.yaml
index 0afe02a..abbe599 100644 (file)
--- a/kubernetes/so/components/so-mariadb/templates/job.yaml
+++ b/kubernetes/so/components/so-mariadb/templates/job.yaml
@@ -116,6 +116,13 @@ spec:
               fieldPath: metadata.namespace
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        resources:
+          limits:
+            cpu: "100m"
+            memory: "0.5Gi"
+          requests:
+            cpu: "3m"
+            memory: "0.02Gi"
       containers:
       - name: {{ include "common.name" . }}-config
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/so/components/so-mariadb/values.yaml b/kubernetes/so/components/so-mariadb/values.yaml
index 8b29e62..38b4d3f 100755 (executable)
--- a/kubernetes/so/components/so-mariadb/values.yaml
+++ b/kubernetes/so/components/so-mariadb/values.yaml
@@ -163,18 +163,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: "4"
+      memory: "8Gi"
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
   unlimited: {}
 
 persistence:

diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml
index 77fe172..d45ee69 100755 (executable)
--- a/kubernetes/so/components/so-nssmf-adapter/values.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml
@@ -131,18 +131,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: {}
 livenessProbe:
   path: /manage/health

diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml
index 967d13e..d1b795d 100755 (executable)
--- a/kubernetes/so/components/so-oof-adapter/values.yaml
+++ b/kubernetes/so/components/so-oof-adapter/values.yaml
@@ -113,18 +113,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: {}
 livenessProbe:
   path: /manage/health

diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 9159fda..15074b5 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -115,18 +115,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 1.5Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1.5Gi"
     requests:
-      memory: 1.5Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1.5Gi"
   large:
     limits:
-      memory: 3Gi
-      cpu: 2
+      cpu: "2"
+      memory: "3Gi"
     requests:
-      memory: 3Gi
-      cpu: 1
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health

diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml
index 7e2d521..9eecb24 100755 (executable)
--- a/kubernetes/so/components/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/values.yaml
@@ -106,18 +106,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 1.5Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1.5Gi"
     requests:
-      memory: 1.5Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1.5Gi"
   large:
     limits:
-      memory: 3Gi
-      cpu: 2
+      cpu: "2"
+      memory: "3Gi"
     requests:
-      memory: 3Gi
-      cpu: 1
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health

diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index cab0d44..1fe5b50 100755 (executable)
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -117,18 +117,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 1.5Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1.5Gi"
     requests:
-      memory: 1.5Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1.5Gi"
   large:
     limits:
-      memory: 3Gi
-      cpu: 2
+      cpu: "2"
+      memory: "3Gi"
     requests:
-      memory: 3Gi
-      cpu: 1
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 
 livenessProbe:

diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index 8e6c044..61ec096 100755 (executable)
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -126,18 +126,18 @@ flavor: small
 resources:
   small:
     limits:
-      memory: 1.5Gi
-      cpu: 1
+      cpu: "1"
+      memory: "1.5Gi"
     requests:
-      memory: 1.5Gi
-      cpu: 0.5
+      cpu: "0.5"
+      memory: "1.5Gi"
   large:
     limits:
-      memory: 3Gi
-      cpu: 2
+      cpu: "2"
+      memory: "3Gi"
     requests:
-      memory: 3Gi
-      cpu: 1
+      cpu: "1"
+      memory: "3Gi"
   unlimited: {}
 livenessProbe:
   path: /manage/health

diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
index 183e7f6..96ff778 100755 (executable)
--- a/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
@@ -52,18 +52,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: {}
 livenessProbe:
   port: 9098

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index ec77d92..e169dd3 100755 (executable)
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -564,18 +564,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 0.5
-      memory: 1Gi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 nodeSelector: {}

diff --git a/kubernetes/strimzi/values.yaml b/kubernetes/strimzi/values.yaml
index a9eed5d..541b4f8 100644 (file)
--- a/kubernetes/strimzi/values.yaml
+++ b/kubernetes/strimzi/values.yaml
@@ -105,11 +105,11 @@ metrics:
     groupRegex: ".*"
     resources:
       requests:
-        cpu: 2
-        memory: 0.6Gi
+        cpu: "2"
+        memory: "0.6Gi"
       limits:
-        cpu: 5
-        memory: 1.5Gi
+        cpu: "5"
+        memory: "1.5Gi"
     logging: debug
     enableSaramaLogging: true
     readinessProbe:

diff --git a/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml b/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
index c084d63..091af3f 100644 (file)
--- a/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
+++ b/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
@@ -48,6 +48,13 @@ spec:
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .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" . }}-job
         image: {{ include "repositoryGenerator.image.postgres" . }}

diff --git a/kubernetes/uui/components/uui-intent-analysis/values.yaml b/kubernetes/uui/components/uui-intent-analysis/values.yaml
index 97bf9c1..71ec4e1 100644 (file)
--- a/kubernetes/uui/components/uui-intent-analysis/values.yaml
+++ b/kubernetes/uui/components/uui-intent-analysis/values.yaml
@@ -110,17 +110,17 @@ wait_for_job_container:
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 1
-      memory: 256Mi
+      cpu: "1"
+      memory: "0.2Gi"
   large:
     limits:
-      cpu: 4
-      memory: 2Gi
+      cpu: "4"
+      memory: "2Gi"
     requests:
-      cpu: 2
-      memory: 1Gi
+      cpu: "2"
+      memory: "1Gi"
   unlimited: {}
 

diff --git a/kubernetes/uui/components/uui-nlp/values.yaml b/kubernetes/uui/components/uui-nlp/values.yaml
index 6c28096..cc87923 100644 (file)
--- a/kubernetes/uui/components/uui-nlp/values.yaml
+++ b/kubernetes/uui/components/uui-nlp/values.yaml
@@ -81,16 +81,16 @@ securityContext:
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 0.5
-      memory: 512Mi
+      cpu: "0.5"
+      memory: "0.5Gi"
   large:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}

diff --git a/kubernetes/uui/components/uui-server/templates/deployment.yaml b/kubernetes/uui/components/uui-server/templates/deployment.yaml
index 3823a70..aec2857 100644 (file)
--- a/kubernetes/uui/components/uui-server/templates/deployment.yaml
+++ b/kubernetes/uui/components/uui-server/templates/deployment.yaml
@@ -62,6 +62,13 @@ spec:
         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" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}

diff --git a/kubernetes/uui/components/uui-server/templates/job.yaml b/kubernetes/uui/components/uui-server/templates/job.yaml
index 4ab3c5f..d1874fc 100644 (file)
--- a/kubernetes/uui/components/uui-server/templates/job.yaml
+++ b/kubernetes/uui/components/uui-server/templates/job.yaml
@@ -40,6 +40,13 @@ spec:
         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" . }}-job
         image: {{ include "repositoryGenerator.image.postgres" . }}

diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index 87756d6..d1bc337 100644 (file)
--- a/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@ -144,18 +144,18 @@ ingress:
 resources:
   small:
     limits:
-      cpu: 1.5
-      memory: 2Gi
+      cpu: "1.5"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 4Gi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 2Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 serviceAccount:

diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index 9db67bf..b7893bc 100644 (file)
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -101,16 +101,16 @@ ingress:
 resources:
   small:
     limits:
-      cpu: 250m
-      memory: 1Gi
+      cpu: "250m"
+      memory: "1Gi"
     requests:
-      cpu: 250m
-      memory: 1Gi
+      cpu: "250m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 500m
-      memory: 1Gi
+      cpu: "500m"
+      memory: "1Gi"
     requests:
-      cpu: 500m
-      memory: 1Gi
+      cpu: "500m"
+      memory: "1Gi"
   unlimited: {}

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 (file)
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
@@ -72,18 +72,18 @@ ingress:
 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 (file)
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
@@ -74,18 +74,18 @@ ingress:
 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 (file)
--- a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
@@ -52,6 +52,13 @@ spec:
         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 (file)
--- a/kubernetes/vfc/components/vfc-nslcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/values.yaml
@@ -93,18 +93,18 @@ ingress:
 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 (file)
--- a/kubernetes/vfc/components/vfc-redis/values.yaml
+++ b/kubernetes/vfc/components/vfc-redis/values.yaml
@@ -66,16 +66,16 @@ ingress:
 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 (file)
--- a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
@@ -52,6 +52,13 @@ spec:
         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 (file)
--- a/kubernetes/vfc/components/vfc-vnflcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
@@ -93,18 +93,18 @@ ingress:
 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 (file)
--- a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
@@ -52,6 +52,13 @@ spec:
         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 (file)
--- a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
@@ -92,18 +92,18 @@ ingress:
 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 (file)
--- a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
@@ -52,6 +52,13 @@ spec:
         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 (file)
--- a/kubernetes/vfc/components/vfc-vnfres/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/values.yaml
@@ -93,18 +93,18 @@ ingress:
 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 (file)
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
@@ -72,18 +72,18 @@ ingress:
 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

diff --git a/kubernetes/vnfsdk/templates/job.yaml b/kubernetes/vnfsdk/templates/job.yaml
index 5e9ad8a..44c0842 100644 (file)
--- a/kubernetes/vnfsdk/templates/job.yaml
+++ b/kubernetes/vnfsdk/templates/job.yaml
@@ -49,6 +49,13 @@ spec:
         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" . }}-job
         image: {{ include "repositoryGenerator.image.postgres" . }}

diff --git a/kubernetes/vnfsdk/values.yaml b/kubernetes/vnfsdk/values.yaml
index 6546572..5c6c1db 100644 (file)
--- a/kubernetes/vnfsdk/values.yaml
+++ b/kubernetes/vnfsdk/values.yaml
@@ -74,18 +74,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2000m
-      memory: 4Gi
+      cpu: "2000m"
+      memory: "4Gi"
     requests:
-      cpu: 500m
-      memory: 1Gi
+      cpu: "500m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 4000m
-      memory: 8Gi
+      cpu: "4000m"
+      memory: "8Gi"
     requests:
-      cpu: 1000m
-      memory: 2Gi
+      cpu: "1000m"
+      memory: "2Gi"
   unlimited: {}
 
 # probe configuration parameters