HELM-65 Fix java options using old Tomcat/8 images

- Fixing quote and var name
xwiki-contrib · Apr 17, 2024 · f183324 · f183324
1 parent 223f429
commit f183324
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/charts/xwiki/templates/initialization-configmaps.yaml b/charts/xwiki/templates/initialization-configmaps.yaml
@@ -131,21 +131,21 @@ data:
 
     if [ -d "/var/lib/jetty" ]; then
       echo "" > start.d/xwiki.ini 
-      {{- range $file, $value := .Values.properties }}
-        echo '-D{{ $file }}={{ $value }}' >> start.d/xwiki.ini 
+      {{- range $prop, $value := .Values.properties }}
+        echo '-D{{ $prop }}={{ $value }}' >> start.d/xwiki.ini 
       {{- end }}
       export JAVA_OPTIONS="${JAVA_OPTS}"
     else 
       if (/usr/local/tomcat/bin/version.sh | grep -q 'Tomcat/8'); then
         echo "Old Tomcat don't support java_opts file... Using normal props."
-        {{- range $file, $value := .Values.properties }}
-          export JAVA_OPTS="${JAVA_OPTS} -D{{ $file }}="{{ $value }}"
+        {{- range $prop, $value := .Values.properties }}
+          export JAVA_OPTS="${JAVA_OPTS} -D{{ $prop }}={{ $value }}"
         {{- end }}
       else 
         ## Clear contents of /tmp/java_opts.txt so that we don't add extra arguments at each pod restart.
         echo "" > /tmp/java_opts.txt
-        {{- range $file, $value := .Values.properties }}
-          echo '-D{{ $file }}="{{ $value }}"' >> /tmp/java_opts.txt
+        {{- range $prop, $value := .Values.properties }}
+          echo '-D{{ $prop }}="{{ $value }}"' >> /tmp/java_opts.txt
         {{- end }}
         export JAVA_OPTS="${JAVA_OPTS} @/tmp/java_opts.txt"
       fi