add ability to push additional java options, release 0.8.1

Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: fcrepo
 description: Fedora Commons Repository 4
 type: application
-version: 0.8.0
+version: 0.8.1
 appVersion: 4.7.5
 dependencies:
   - name: postgresql

index.yaml

@@ -3,7 +3,22 @@ entries:
   fcrepo:
   - apiVersion: v2
     appVersion: 4.7.5
-    created: "2021-03-24T00:48:23.920354-07:00"
+    created: "2021-09-13T10:01:48.371527-07:00"
+    dependencies:
+    - condition: postgresql.enabled
+      name: postgresql
+      repository: https://charts.bitnami.com/bitnami
+      version: 9.3.3
+    description: Fedora Commons Repository 4
+    digest: 510e426344d737cbdaf38bdf51412e7bc0c5c03f082db8e95a795f78e331af7c
+    name: fcrepo
+    type: application
+    urls:
+    - https://samvera-labs.github.io/fcrepo-charts/fcrepo-0.8.1.tgz
+    version: 0.8.1
+  - apiVersion: v2
+    appVersion: 4.7.5
+    created: "2021-09-13T10:01:48.367888-07:00"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -18,7 +33,7 @@ entries:
     version: 0.6.1
   - apiVersion: v2
     appVersion: 4.7.5
-    created: "2021-03-24T00:48:23.91684-07:00"
+    created: "2021-09-13T10:01:48.363935-07:00"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -33,7 +48,7 @@ entries:
     version: 0.6.0
   - apiVersion: v2
     appVersion: 4.7.5
-    created: "2021-03-24T00:48:23.911981-07:00"
+    created: "2021-09-13T10:01:48.358538-07:00"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -48,7 +63,7 @@ entries:
     version: 0.5.5
   - apiVersion: v2
     appVersion: 4.7.5
-    created: "2021-03-24T00:48:23.90655-07:00"
+    created: "2021-09-13T10:01:48.354077-07:00"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -63,7 +78,7 @@ entries:
     version: 0.5.4
   - apiVersion: v2
     appVersion: 4.7.5
-    created: "2021-03-24T00:48:23.884321-07:00"
+    created: "2021-09-13T10:01:48.328951-07:00"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -78,7 +93,7 @@ entries:
     version: 0.5.3
   - apiVersion: v2
     appVersion: 4.7.5
-    created: "2021-03-24T00:48:23.865546-07:00"
+    created: "2021-09-13T10:01:48.308198-07:00"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -93,7 +108,7 @@ entries:
     version: 0.5.2
   - apiVersion: v2
     appVersion: 4.7.5
-    created: "2021-03-24T00:48:23.85537-07:00"
+    created: "2021-09-13T10:01:48.297494-07:00"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -108,7 +123,7 @@ entries:
     version: 0.5.1
   - apiVersion: v2
     appVersion: 4.7.5
-    created: "2021-03-24T00:48:23.849428-07:00"
+    created: "2021-09-13T10:01:48.291353-07:00"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -123,7 +138,7 @@ entries:
     version: 0.5.0
   - apiVersion: v2
     appVersion: "4.7"
-    created: "2021-03-24T00:48:23.844077-07:00"
+    created: "2021-09-13T10:01:48.285201-07:00"
     dependencies:
     - condition: postgresql.enabled
       name: postgresql
@@ -141,7 +156,7 @@ entries:
       category: Database
     apiVersion: v1
     appVersion: 11.9.0
-    created: "2021-03-24T00:48:23.92277-07:00"
+    created: "2021-09-13T10:01:48.374507-07:00"
     dependencies:
     - name: common
       repository: https://charts.bitnami.com/bitnami
@@ -169,4 +184,4 @@ entries:
     urls:
     - https://samvera-labs.github.io/fcrepo-charts/charts/postgresql-9.3.3.tgz
     version: 9.3.3
-generated: "2021-03-24T00:48:23.837956-07:00"
+generated: "2021-09-13T10:01:48.27968-07:00"

templates/_helpers.tpl

@@ -105,3 +105,10 @@ Return PostgreSQL password
     {{- .Values.postgresql.postgresqlPassword }}
 {{- end }}
 {{- end }}
+
+{{/*
+Return any addtional options to the JVM
+*/}}
+{{- define "fcrepo.additional_java_options" }}
+{{- default " " .Values.additional_java_options }}
+{{- end }}

templates/secret.yaml

@@ -11,8 +11,8 @@ data:
 
   {{- if .Values.s3.enabled }}
   MODESHAPE_CONFIG: {{ "classpath:/config/jdbc-postgresql-s3/repository.json" | b64enc }}
-  JAVA_OPTIONS: {{ printf "-Daws.bucket=%s -Daws.accessKeyId=%s -Daws.secretKey=%s -Dfcrepo.postgresql.host=%s -Dfcrepo.postgresql.username=%s -Dfcrepo.postgresql.password=%s -Dfcrepo.object.directory=/data/objects" .Values.s3.bucket .Values.s3.access_key .Values.s3.secret_key ( include "fcrepo.postgresql.host" . ) (include "fcrepo.postgresql.username" .) (include "fcrepo.postgresql.password" .) | b64enc }}
+  JAVA_OPTIONS: {{ printf "-Daws.bucket=%s -Daws.accessKeyId=%s -Daws.secretKey=%s -Dfcrepo.postgresql.host=%s -Dfcrepo.postgresql.username=%s -Dfcrepo.postgresql.password=%s -Dfcrepo.object.directory=/data/objects %s" .Values.s3.bucket .Values.s3.access_key .Values.s3.secret_key ( include "fcrepo.postgresql.host" . ) (include "fcrepo.postgresql.username" .) (include "fcrepo.postgresql.password" .) (include "fcrepo.additional_java_options" .) | b64enc }}
   {{- else }}
   MODESHAPE_CONFIG: {{ "classpath:/config/jdbc-postgresql/repository.json" | b64enc }}
-  JAVA_OPTIONS: {{ printf "-Dfcrepo.postgresql.host=%s -Dfcrepo.postgresql.username=%s -Dfcrepo.postgresql.password=%s -Dfcrepo.object.directory=/data/objects -Dfcrepo.binary.directory=/data/binaries" ( include "fcrepo.postgresql.host" . ) (include "fcrepo.postgresql.username" .) (include "fcrepo.postgresql.password" .) | b64enc }}
+  JAVA_OPTIONS: {{ printf "-Dfcrepo.postgresql.host=%s -Dfcrepo.postgresql.username=%s -Dfcrepo.postgresql.password=%s -Dfcrepo.object.directory=/data/objects -Dfcrepo.binary.directory=/data/binaries %s" ( include "fcrepo.postgresql.host" . ) (include "fcrepo.postgresql.username" .) (include "fcrepo.postgresql.password" .) (include "fcrepo.additional_java_options" .) | b64enc }}
   {{- end }}

values.yaml

@@ -89,3 +89,5 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+additional_java_options: