diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml index 316866a..8ee469d 100644 --- 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/horizon/templates/opennms-core.statefulset.yaml b/horizon/templates/opennms-core.statefulset.yaml index 4757b9a..8b0f123 100644 --- a/horizon/templates/opennms-core.statefulset.yaml +++ b/horizon/templates/opennms-core.statefulset.yaml @@ -100,8 +100,6 @@ spec: capabilities: drop: - ALL - {{- else }} - fsGroup: 10001 {{- end }} command: [ bash, /scripts/onms-core-init.sh ] envFrom: @@ -161,8 +159,6 @@ spec: drop: - ALL {{- end }} - {{- else }} - fsGroup: 10001 {{- end }} imagePullPolicy: {{ .Values.core.image.pullPolicy }} args: diff --git a/minion/Chart.yaml b/minion/Chart.yaml index 896ef81..9023d17 100644 --- 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/README.md b/minion/README.md index cafc574..3884d93 100644 --- a/minion/README.md +++ b/minion/README.md @@ -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 | `""` | | diff --git a/minion/templates/minion-deployment.yaml b/minion/templates/minion-deployment.yaml index 252c2ed..321ff1b 100644 --- a/minion/templates/minion-deployment.yaml +++ b/minion/templates/minion-deployment.yaml @@ -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 diff --git a/minion/values.yaml b/minion/values.yaml index 9cf6fb8..7c7444a 100644 --- a/minion/values.yaml +++ b/minion/values.yaml @@ -43,6 +43,7 @@ minion: requests: cpu: '2' memory: 4Gi + javaOpts: '' core: