From 75e70c29cc66415e8e68cedebd11224b71be7954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Wed, 21 Feb 2024 17:56:32 +0100 Subject: [PATCH] Don't erase OpenSearch limits with the app's --- src/main/helm/values.staging.yaml | 6 +++--- src/main/resources/application.properties | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/helm/values.staging.yaml b/src/main/helm/values.staging.yaml index c4c9fe47..45098042 100644 --- a/src/main/helm/values.staging.yaml +++ b/src/main/helm/values.staging.yaml @@ -12,11 +12,11 @@ app: memory: 500Mi opensearch: envs: - OPENSEARCH_JAVA_OPTS: ' -Xms800m -Xmx800m ' + OPENSEARCH_JAVA_OPTS: ' -Xms700m -Xmx700m ' resources: limits: cpu: 1000m - memory: 1.7Gi + memory: 1.5Gi requests: cpu: 500m - memory: 1.5Gi \ No newline at end of file + memory: 1.0Gi \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2dad55d6..8cab72fd 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -199,10 +199,10 @@ quarkus.openshift.resources.limits.cpu=2000m quarkus.openshift.resources.requests.cpu=400m quarkus.openshift.resources.limits.memory=2Gi quarkus.openshift.resources.requests.memory=1Gi -quarkus.helm.values."resources.limits.cpu".paths=spec.template.spec.containers.resources.limits.cpu -quarkus.helm.values."resources.requests.cpu".paths=spec.template.spec.containers.resources.requests.cpu -quarkus.helm.values."resources.limits.memory".paths=spec.template.spec.containers.resources.limits.memory -quarkus.helm.values."resources.requests.memory".paths=spec.template.spec.containers.resources.requests.memory +quarkus.helm.values."resources.limits.cpu".paths=(kind == Deployment).spec.template.spec.containers.resources.limits.cpu +quarkus.helm.values."resources.requests.cpu".paths=(kind == Deployment).spec.template.spec.containers.resources.requests.cpu +quarkus.helm.values."resources.limits.memory".paths=(kind == Deployment).spec.template.spec.containers.resources.limits.memory +quarkus.helm.values."resources.requests.memory".paths=(kind == Deployment).spec.template.spec.containers.resources.requests.memory # Indexing settings (overridden for staging, see src/main/helm) quarkus.openshift.env.vars.INDEXING_QUEUE_COUNT=${INDEXING_QUEUE_COUNT} quarkus.openshift.env.vars.INDEXING_BULK_SIZE=${INDEXING_BULK_SIZE}