Remove hard coded min,max memory and allow users to pass JAVA_OPTS

OpenNMS · Mar 6, 2024 · 2f2ca64 · 2f2ca64
1 parent 4ed702e
commit 2f2ca64
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -43,6 +43,7 @@ minion:
   requests:
    cpu: '2'
    memory: 4Gi
+ javaOpts: ''
 
 
 core: