Don't erase OpenSearch limits with the app's

quarkusio · Feb 21, 2024 · 75e70c2 · 75e70c2
1 parent 265007d
commit 75e70c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
+      memory: 1.0Gi
diff --git 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}