From 2ac422acb991eddcd5514e044801b979fff9e112 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Wed, 25 Oct 2023 14:19:19 +0200 Subject: [PATCH] [AAI] Add variables for HEAP and METASPACE sizes Add environment variables for aai-resources and aai-traversal pods to set the HEAP and METASPACE sizes Issue-ID: OOM-3248 Change-Id: Ifd28915564bb9309f679c5c7a2e56149aee27a57 Signed-off-by: Andreas Geissler --- kubernetes/aai/components/aai-resources/templates/deployment.yaml | 6 ++++++ kubernetes/aai/components/aai-resources/values.yaml | 6 ++++++ kubernetes/aai/components/aai-traversal/templates/deployment.yaml | 6 ++++++ kubernetes/aai/components/aai-traversal/values.yaml | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml index 5b9e9d222f..626dc71506 100644 --- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml @@ -135,6 +135,12 @@ spec: echo "*** actual launch of AAI Resources" /bin/bash /opt/app/aai-resources/docker-entrypoint.sh env: + {{- if .Values.config.env }} + {{- range $key,$value := .Values.config.env }} + - name: {{ $key | upper | quote}} + value: {{ $value | quote}} + {{- end }} + {{- end }} - name: LOCAL_USER_ID value: {{ .Values.global.config.userId | quote }} - name: LOCAL_GROUP_ID diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml index e5cc716f3f..7615f4b1d3 100644 --- a/kubernetes/aai/components/aai-resources/values.yaml +++ b/kubernetes/aai/components/aai-resources/values.yaml @@ -175,6 +175,12 @@ config: # Specifies if the bulk can be override and if it can the value override: false + # environment variables added to the launch of the image in deployment + env: + MIN_HEAP_SIZE: "512m" + MAX_HEAP_SIZE: "1024m" + MAX_METASPACE_SIZE: "512m" + nodeSelector: {} affinity: {} diff --git a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml index 6d12f08755..9a61841e67 100644 --- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml @@ -154,6 +154,12 @@ spec: echo "*** actual launch of AAI Resources" /bin/bash /opt/app/aai-traversal/docker-entrypoint.sh env: + {{- if .Values.config.env }} + {{- range $key,$value := .Values.config.env }} + - name: {{ $key | upper | quote}} + value: {{ $value | quote}} + {{- end }} + {{- end }} - name: DISABLE_UPDATE_QUERY value: {{ .Values.config.disableUpdateQuery | quote }} - name: LOCAL_USER_ID diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml index 349fe77496..6230576b8b 100644 --- a/kubernetes/aai/components/aai-traversal/values.yaml +++ b/kubernetes/aai/components/aai-traversal/values.yaml @@ -166,6 +166,12 @@ config: # Specifies how long should it wait before timing out the REST request limit: 180000 + # environment variables added to the launch of the image in deployment + env: + MIN_HEAP_SIZE: "512m" + MAX_HEAP_SIZE: "1024m" + MAX_METASPACE_SIZE: "512m" + # Disables the updateQueryData script to run as part of traversal disableUpdateQuery: true -- 2.16.6