Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add helm value for custom jmx jar location when using other jmx init container images #846

Merged
merged 4 commits into from
Aug 5, 2024
Merged

Add helm value for custom jmx jar location when using other jmx init container images #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5816ebe
add helm value for custom jmx jar location when using other jmx init …
corang Jul 31, 2024
e216ee3
Merge branch 'main' into jmx-jar-copy-location
corang Aug 5, 2024
e253583
fix: added correct expected yaml output files
corang Aug 5, 2024
8c46596
fix: missed some files
corang Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/charts/bamboo/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down
5 changes: 5 additions & 0 deletions src/main/charts/bitbucket/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion src/main/charts/common/templates/_jmx.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 5 additions & 0 deletions src/main/charts/confluence/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down
5 changes: 5 additions & 0 deletions src/main/charts/crowd/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down
5 changes: 5 additions & 0 deletions src/main/charts/jira/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/expected_helm_output/bamboo/output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ data:
jmxExporterImageTag: 0.18.0
jmxExporterInitContainer:
customSecurityContext: {}
jmxJarLocation: null
resources: {}
runAsRoot: true
jmxExporterPort: 9999
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/expected_helm_output/bitbucket/output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ data:
jmxExporterImageTag: 0.18.0
jmxExporterInitContainer:
customSecurityContext: {}
jmxJarLocation: null
resources: {}
runAsRoot: true
jmxExporterPort: 9999
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/expected_helm_output/confluence/output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ data:
jmxExporterImageTag: 0.18.0
jmxExporterInitContainer:
customSecurityContext: {}
jmxJarLocation: null
resources: {}
runAsRoot: true
jmxExporterPort: 9999
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/expected_helm_output/crowd/output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ data:
jmxExporterImageTag: 0.18.0
jmxExporterInitContainer:
customSecurityContext: {}
jmxJarLocation: null
resources: {}
runAsRoot: true
jmxExporterPort: 9999
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/expected_helm_output/jira/output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ data:
jmxExporterImageTag: 0.18.0
jmxExporterInitContainer:
customSecurityContext: {}
jmxJarLocation: null
resources: {}
runAsRoot: true
jmxExporterPort: 9999
Expand Down
Loading