From 2f2ca643da39a175bad5c4e4a5d7fcdda0446211 Mon Sep 17 00:00:00 2001
From: Morteza E <105240903+mershad-manesh@users.noreply.github.com>
Date: Wed, 6 Mar 2024 09:47:49 -0500
Subject: [PATCH] Remove hard coded min,max memory and allow users to pass
 JAVA_OPTS

---
 horizon/Chart.yaml                      |  2 +-
 minion/Chart.yaml                       |  2 +-
 minion/templates/minion-deployment.yaml | 10 +++-------
 minion/values.yaml                      |  1 +
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml
index 316866a..8ee469d 100644
--- a/horizon/Chart.yaml
+++ b/horizon/Chart.yaml
@@ -17,7 +17,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.12
+version: 1.1.13
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/minion/Chart.yaml b/minion/Chart.yaml
index 896ef81..9023d17 100644
--- a/minion/Chart.yaml
+++ b/minion/Chart.yaml
@@ -17,7 +17,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.12
+version: 1.1.13
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/minion/templates/minion-deployment.yaml b/minion/templates/minion-deployment.yaml
index 252c2ed..b14f88d 100644
--- a/minion/templates/minion-deployment.yaml
+++ b/minion/templates/minion-deployment.yaml
@@ -49,14 +49,10 @@ spec:
               value: /usr/lib/jvm/java-nocap
             {{- end }}   
             {{- end }}
-            - name: JAVA_MAX_MEM
-              value: 2048M
-            - name: JAVA_MIN_MEM
-              value: 512M
-            {{- if .Values.truststore.content }}
             - name: JAVA_OPTS
-              value: -Djavax.net.ssl.trustStore=/etc/java/jks/truststore.jks -Djavax.net.ssl.trustStorePassword={{ .Values.truststore.password }}
-            {{- end }}
+              value: |
+                {{ default "" .Values.minion.javaOpts }}
+                {{- if .Values.truststore.content  }} -Djavax.net.ssl.trustStore=/etc/java/jks/truststore.jks -Djavax.net.ssl.trustStorePassword={{ .Values.truststore.password }} {{- end }}
             - name: TZ
               value: America/New_York
           image: {{ $image }}
diff --git a/minion/values.yaml b/minion/values.yaml
index 9cf6fb8..7c7444a 100644
--- a/minion/values.yaml
+++ b/minion/values.yaml
@@ -43,6 +43,7 @@ minion:
   requests:
    cpu: '2'
    memory: 4Gi
+ javaOpts: ''
 
 
 core: