[bitnami/tomcat] Another monitoring fixes (#8940)

bitnami/tomcat/Chart.yaml

@@ -26,4 +26,4 @@ name: tomcat
 sources:
   - https://github.com/bitnami/bitnami-docker-tomcat
   - http://tomcat.apache.org
-version: 10.1.8
+version: 10.1.9

bitnami/tomcat/templates/_helpers.tpl

@@ -61,7 +61,11 @@ Expand the name of the chart.
 Return the proper CATALINA_OPTS value
 */}}
 {{- define "tomcat.catalinaOpts" -}}
-  {{- printf "%s %s" .Values.catalinaOpts .Values.metrics.jmx.catalinaOpts  | trim  -}}
+{{- if .Values.metrics.jmx.enabled -}}
+{{- default "" (cat .Values.catalinaOpts .Values.metrics.jmx.catalinaOpts) | trim  -}}
+{{- else -}} 
+{{- default "" .Values.catalinaOpts  | trim -}}
+{{- end -}}
 {{- end -}}
 
 {{/*

bitnami/tomcat/templates/_pod.tpl

@@ -76,6 +76,10 @@ containers:
             key: tomcat-password
       - name: TOMCAT_ALLOW_REMOTE_MANAGEMENT
         value: {{ .Values.tomcatAllowRemoteManagement | quote }}
+      {{- if or .Values.catalinaOpts .Values.metrics.jmx.enabled }}
+      - name: CATALINA_OPTS
+        value: {{ include "tomcat.catalinaOpts" . | quote }} 
+      {{- end }}
       {{- if .Values.extraEnvVars }}
       {{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 6 }}
       {{- end }}