aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/aai
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2024-02-27 08:55:23 +0100
committerAndreas Geissler <andreas-geissler@telekom.de>2024-02-28 13:36:38 +0000
commit4753743f0743a6b22f69e718c3cdb4ba8843cea6 (patch)
treeb94e42485a252d3ed348faa13ac4a009ad17c10b /kubernetes/aai
parentee7e3ada3228e4c80b622aa588d48ac34789cedd (diff)
[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>
Diffstat (limited to 'kubernetes/aai')
-rw-r--r--kubernetes/aai/components/aai-babel/values.yaml16
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml7
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml7
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml7
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml14
-rw-r--r--kubernetes/aai/components/aai-graphadmin/values.yaml16
-rw-r--r--kubernetes/aai/components/aai-modelloader/values.yaml16
-rw-r--r--kubernetes/aai/components/aai-resources/templates/deployment.yaml7
-rw-r--r--kubernetes/aai/components/aai-resources/values.yaml24
-rw-r--r--kubernetes/aai/components/aai-schema-service/values.yaml24
-rw-r--r--kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml7
-rw-r--r--kubernetes/aai/components/aai-sparky-be/values.yaml16
-rw-r--r--kubernetes/aai/components/aai-traversal/templates/deployment.yaml7
-rw-r--r--kubernetes/aai/components/aai-traversal/templates/job.yaml7
-rw-r--r--kubernetes/aai/components/aai-traversal/values.yaml16
-rw-r--r--kubernetes/aai/values.yaml20
16 files changed, 137 insertions, 74 deletions
diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml
index c9f930abae..e058d82e46 100644
--- 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 c3e36c2be6..234718c3ac 100644
--- 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 865dfe3eeb..a36d90407e 100644
--- 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 1a8124929f..7d2504e108 100644
--- 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 bf3279fde7..6310f9e0ce 100644
--- 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 e320f51a82..8b6b5f906a 100644
--- 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 57c562bfd2..aa62f60f00 100644
--- 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 54097faf6d..edf63c5eba 100644
--- 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 007c60e19e..b1d32028c2 100644
--- 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 4266978b9f..ccda86dc0d 100644
--- 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 cf7a309ef0..d9558370d0 100644
--- 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 8cfd2c6622..0a9de51e54 100644
--- 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 8f52fe26df..3171d4c534 100644
--- 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 71816d7a24..2d7daf1414 100644
--- 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 a1c383e522..aca1ec7731 100644
--- 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 6e90089298..ddb018e793 100644
--- 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