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

NMS-16365: Dynamically scaling heap memory size #59

Merged
merged 8 commits into from
Mar 11, 2024
Merged

NMS-16365: Dynamically scaling heap memory size #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a00320
clean up extra resource declaration
mershad-manesh Mar 6, 2024
4ed702e
update the Charts version
mershad-manesh Mar 6, 2024
2f2ca64
Remove hard coded min,max memory and allow users to pass JAVA_OPTS
mershad-manesh Mar 6, 2024
c278e68
update readme.md file
mershad-manesh Mar 6, 2024
a24ccf3
fix spacing in readme file
mershad-manesh Mar 6, 2024
c91e710
fix readme file
mershad-manesh Mar 6, 2024
f7d9665
remove extra fsGroup and expand the ifstatement for java opts
mershad-manesh Mar 6, 2024
9af5889
Merge branch 'main' into mem/NMS-16365
mershad-manesh Mar 11, 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
2 changes: 1 addition & 1 deletion horizon/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions horizon/templates/opennms-core.statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ spec:
capabilities:
drop:
- ALL
{{- else }}
fsGroup: 10001
{{- end }}
command: [ bash, /scripts/onms-core-init.sh ]
envFrom:
Expand Down Expand Up @@ -161,8 +159,6 @@ spec:
drop:
- ALL
{{- end }}
{{- else }}
fsGroup: 10001
{{- end }}
imagePullPolicy: {{ .Values.core.image.pullPolicy }}
args:
Expand Down
2 changes: 1 addition & 1 deletion minion/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions minion/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ echo "Hello World" > etc/hello.txt
| minion.image.pullPolicy | string | `"IfNotPresent"` | |
| minion.image.repository | string | `"opennms/minion"` | |
| minion.image.tag | string | `""` | |
| minion.javaOpts | string | `""` | |
| minion.kafkaBroker.address | string | `"onms-kafka-bootstrap.shared.svc:9093"` | |
| minion.kafkaBroker.password | string | `""` | |
| minion.kafkaBroker.username | string | `""` | |
Expand Down
14 changes: 9 additions & 5 deletions minion/templates/minion-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,17 @@ 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 }}
{{- if or (.Values.minion.javaOpts) (.Values.truststore.content) }}
- name: JAVA_OPTS
{{- if .Values.truststore.content }}
{{- if .Values.minion.javaOpts }}
value: -Djavax.net.ssl.trustStore=/etc/java/jks/truststore.jks -Djavax.net.ssl.trustStorePassword={{ .Values.truststore.password }} {{ .Values.minion.javaOpts }}
{{- else }}
value: -Djavax.net.ssl.trustStore=/etc/java/jks/truststore.jks -Djavax.net.ssl.trustStorePassword={{ .Values.truststore.password }}
{{- end }}
{{- else }}
value: {{ .Values.minion.javaOpts }}
{{- end }}
{{- end }}
- name: TZ
value: America/New_York
Expand Down
1 change: 1 addition & 0 deletions minion/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ minion:
requests:
cpu: '2'
memory: 4Gi
javaOpts: ''


core:
Expand Down
Loading