feat(nexus3): Allow env vars to be interpolated in INSTALL4J_ADD_VM_P…

…ARAMS (#827)
stevehipwell · Nov 25, 2023 · b84a4e5 · b84a4e5
1 parent cf80eaa
commit b84a4e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/charts/nexus3/CHANGELOG.md b/charts/nexus3/CHANGELOG.md
@@ -20,6 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 
+### Changed
+
+- Support embedding of env vars for JVM by permitting `INSTALL4J_ADD_VM_PARAMS` to be defined after all other env vars
 - Lifecycle script configure.sh prefixes log errors with `ERROR:` and echos the same string to `$TERMINATION_LOG`
 
 ## [v4.36.0] - 2023-11-10

diff --git a/charts/nexus3/templates/deployment.yaml b/charts/nexus3/templates/deployment.yaml
@@ -102,22 +102,22 @@ spec:
           image: {{ include "nexus3.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-            - name: INSTALL4J_ADD_VM_PARAMS
-              {{- if .Values.caCerts.enabled }}
-              value: {{ printf "-Xms%s -Xmx%s %s -Djava.util.prefs.userRoot=/nexus-data/javaprefs -Djavax.net.ssl.trustStore=/nexus-data/keystores/cacerts %s" .Values.envVars.jvmMinHeapSize .Values.envVars.jvmMaxHeapSize .Values.envVars.jvmAdditionalMemoryOptions .Values.envVars.jvmAdditionalOptions | quote }}
-              {{- else }}
-              value: {{ printf "-Xms%s -Xmx%s %s -Djava.util.prefs.userRoot=/nexus-data/javaprefs %s" .Values.envVars.jvmMinHeapSize .Values.envVars.jvmMaxHeapSize .Values.envVars.jvmAdditionalMemoryOptions .Values.envVars.jvmAdditionalOptions | quote }}
-              {{- end }}
+          {{- with .Values.env }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- if or .Values.rootPassword.secret .Values.config.rootPassword.secret }}
             - name: NEXUS_SECURITY_INITIAL_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ default .Values.rootPassword.secret .Values.config.rootPassword.secret }}
                   key: {{ default .Values.rootPassword.key .Values.config.rootPassword.key }}
           {{- end }}
-          {{- with .Values.env }}
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
+            - name: INSTALL4J_ADD_VM_PARAMS
+              {{- if .Values.caCerts.enabled }}
+              value: {{ printf "-Xms%s -Xmx%s %s -Djava.util.prefs.userRoot=/nexus-data/javaprefs -Djavax.net.ssl.trustStore=/nexus-data/keystores/cacerts %s" .Values.envVars.jvmMinHeapSize .Values.envVars.jvmMaxHeapSize .Values.envVars.jvmAdditionalMemoryOptions .Values.envVars.jvmAdditionalOptions | quote }}
+              {{- else }}
+              value: {{ printf "-Xms%s -Xmx%s %s -Djava.util.prefs.userRoot=/nexus-data/javaprefs %s" .Values.envVars.jvmMinHeapSize .Values.envVars.jvmMaxHeapSize .Values.envVars.jvmAdditionalMemoryOptions .Values.envVars.jvmAdditionalOptions | quote }}
+              {{- end }}
           {{- if and .Values.config.enabled (or .Values.rootPassword.secret .Values.config.rootPassword.secret) }}
           lifecycle:
             postStart: