Add helm value for custom jmx jar location when using other jmx init …

…container images (#846) * add helm value for custom jmx jar location when using other jmx init container images * fix: added correct expected yaml output files * fix: missed some files
atlassian · Aug 5, 2024 · f89a681 · f89a681
1 parent 19cc5e6
commit f89a681
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 1 deletion.
diff --git a/src/main/charts/bamboo/values.yaml b/src/main/charts/bamboo/values.yaml
@@ -980,6 +980,12 @@ monitoring:
   #
   jmxExporterInitContainer:
 
+    # -- The location of the JMX exporter jarfile in the JMX exporter image
+    # Leave blank for default bitnami image
+    #
+    jmxJarLocation:
+
+
     # -- Whether to run JMX exporter init container as root to copy JMX exporter binary to shared home volume.
     # Set to false if running containers as root is not allowed in the cluster.
     #

diff --git a/src/main/charts/bitbucket/values.yaml b/src/main/charts/bitbucket/values.yaml
@@ -1216,6 +1216,11 @@ monitoring:
   #
   jmxExporterInitContainer:
 
+    # -- The location of the JMX exporter jarfile in the JMX exporter image
+    # Leave blank for default bitnami image
+    #
+    jmxJarLocation:
+
     # -- Whether to run JMX exporter init container as root to copy JMX exporter binary to shared home volume.
     # Set to false if running containers as root is not allowed in the cluster.
     #

diff --git a/src/main/charts/common/templates/_jmx.tpl b/src/main/charts/common/templates/_jmx.tpl
@@ -29,7 +29,7 @@ Jmx init container
 - name: fetch-jmx-exporter
   image: {{ .Values.monitoring.jmxExporterImageRepo}}:{{ .Values.monitoring.jmxExporterImageTag}}
   command: ["cp"]
-  args: ["/opt/bitnami/jmx-exporter/jmx_prometheus_javaagent.jar", "{{ .Values.volumes.sharedHome.mountPath }}"]
+  args: ["{{ .Values.monitoring.jmxExporterInitContainer.jmxJarLocation | default "/opt/bitnami/jmx-exporter/jmx_prometheus_javaagent.jar" }}", "{{ .Values.volumes.sharedHome.mountPath }}"]
   {{- if .Values.monitoring.jmxExporterInitContainer.resources }}
   resources:
   {{- with .Values.monitoring.jmxExporterInitContainer.resources }}

diff --git a/src/main/charts/confluence/values.yaml b/src/main/charts/confluence/values.yaml
@@ -1052,6 +1052,11 @@ monitoring:
   #
   jmxExporterInitContainer:
 
+    # -- The location of the JMX exporter jarfile in the JMX exporter image
+    # Leave blank for default bitnami image
+    #
+    jmxJarLocation:
+
     # -- Whether to run JMX exporter init container as root to copy JMX exporter binary to shared home volume.
     # Set to false if running containers as root is not allowed in the cluster.
     #

diff --git a/src/main/charts/crowd/values.yaml b/src/main/charts/crowd/values.yaml
@@ -926,6 +926,11 @@ monitoring:
   #
   jmxExporterInitContainer:
 
+    # -- The location of the JMX exporter jarfile in the JMX exporter image
+    # Leave blank for default bitnami image
+    #
+    jmxJarLocation:
+
     # -- Whether to run JMX exporter init container as root to copy JMX exporter binary to shared home volume.
     # Set to false if running containers as root is not allowed in the cluster.
     #

diff --git a/src/main/charts/jira/values.yaml b/src/main/charts/jira/values.yaml
@@ -877,6 +877,11 @@ monitoring:
   #
   jmxExporterInitContainer:
 
+    # -- The location of the JMX exporter jarfile in the JMX exporter image
+    # Leave blank for default bitnami image
+    #
+    jmxJarLocation:
+
     # -- Whether to run JMX exporter init container as root to copy JMX exporter binary to shared home volume.
     # Set to false if running containers as root is not allowed in the cluster.
     #

diff --git a/src/test/resources/expected_helm_output/bamboo/output.yaml b/src/test/resources/expected_helm_output/bamboo/output.yaml
@@ -274,6 +274,7 @@ data:
       jmxExporterImageTag: 0.18.0
       jmxExporterInitContainer:
         customSecurityContext: {}
+        jmxJarLocation: null
         resources: {}
         runAsRoot: true
       jmxExporterPort: 9999

diff --git a/src/test/resources/expected_helm_output/bitbucket/output.yaml b/src/test/resources/expected_helm_output/bitbucket/output.yaml
@@ -307,6 +307,7 @@ data:
       jmxExporterImageTag: 0.18.0
       jmxExporterInitContainer:
         customSecurityContext: {}
+        jmxJarLocation: null
         resources: {}
         runAsRoot: true
       jmxExporterPort: 9999

diff --git a/src/test/resources/expected_helm_output/confluence/output.yaml b/src/test/resources/expected_helm_output/confluence/output.yaml
@@ -251,6 +251,7 @@ data:
       jmxExporterImageTag: 0.18.0
       jmxExporterInitContainer:
         customSecurityContext: {}
+        jmxJarLocation: null
         resources: {}
         runAsRoot: true
       jmxExporterPort: 9999

diff --git a/src/test/resources/expected_helm_output/crowd/output.yaml b/src/test/resources/expected_helm_output/crowd/output.yaml
@@ -220,6 +220,7 @@ data:
       jmxExporterImageTag: 0.18.0
       jmxExporterInitContainer:
         customSecurityContext: {}
+        jmxJarLocation: null
         resources: {}
         runAsRoot: true
       jmxExporterPort: 9999

diff --git a/src/test/resources/expected_helm_output/jira/output.yaml b/src/test/resources/expected_helm_output/jira/output.yaml
@@ -238,6 +238,7 @@ data:
       jmxExporterImageTag: 0.18.0
       jmxExporterInitContainer:
         customSecurityContext: {}
+        jmxJarLocation: null
         resources: {}
         runAsRoot: true
       jmxExporterPort: 9999