Use the correct content type in the backups CronJob

Chart.yaml

@@ -5,7 +5,7 @@ apiVersion: v2
 name: graphdb
 description: GraphDB is a highly efficient, scalable and robust graph database with RDF and SPARQL support.
 type: application
-version: 12.3.0
+version: 12.3.1
 appVersion: 11.3.0
 kubeVersion: ^1.26.0-0
 home: https://graphdb.ontotext.com/

README.md

@@ -1,7 +1,7 @@
 # Helm Chart for GraphDB
 
 [![CI](https://github.com/Ontotext-AD/graphdb-helm/actions/workflows/ci.yml/badge.svg)](https://github.com/Ontotext-AD/graphdb-helm/actions/workflows/ci.yml)
-![Version: 12.3.0](https://img.shields.io/badge/Version-12.3.0-informational?style=flat-square)
+![Version: 12.3.1](https://img.shields.io/badge/Version-12.3.1-informational?style=flat-square)
 ![AppVersion: 11.3.0](https://img.shields.io/badge/AppVersion-11.3.0-informational?style=flat-square)
 
 <!--

files/scripts/graphdb.sh

@@ -140,9 +140,8 @@ function cloudBackup {
     -o "${response}" \
     -w "Status=%{response_code}" \
     --header "Authorization: Basic ${GRAPHDB_AUTH_TOKEN}" \
-    --header 'Content-Type: application/json' \
     --header 'Accept: application/json' \
-    --data-binary "${backup_options}" \
+    --form-string "params=${backup_options}" \
     --url "${GRAPHDB_PROTOCOL}://${GRAPHDB_SERVICE_NAME}:${GRAPHDB_SERVICE_PORT}/rest/recovery/cloud-backup")
 
   if ! echo "${response_status}" | grep -q 'Status=200' ; then

templates/graphdb/statefulset.yaml

@@ -439,8 +439,10 @@ spec:
           volumeMounts:
             - name: {{ .Values.persistence.volumeClaimTemplate.name }}
               mountPath: /opt/graphdb/home
+            {{- if .Values.tempVolume.enabled }}
             - name: temp-dir
               mountPath: /tmp
+            {{- end }}
             {{- if .Values.license.existingSecret }}
             - name: graphdb-license
               mountPath: {{ .Values.license.mountPath }}

templates/jobs/secret-backup-options.yaml

@@ -1,4 +1,9 @@
 {{- if and .Values.backup.enabled (not .Values.backup.optionsSecret.existingSecret) }}
+{{- $options := dict }}
+{{- if eq .Values.backup.type "cloud" -}}
+  {{- $options = set $options "bucketUri" (required "backup.cloud.bucketUri is required" .Values.backup.cloud.bucketUri) -}}
+{{- end -}}
+{{- $options = merge (default dict .Values.backup.options) $options -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -13,10 +18,5 @@ metadata:
 type: Opaque
 stringData:
   {{ .Values.backup.optionsSecret.secretKey }}: |
-    {
-      "backupOptions": {{- .Values.backup.options | toPrettyJson | nindent 8 }}
-      {{- if eq .Values.backup.type "cloud" }},
-      "bucketUri": {{ required "backup.cloud.bucketUri is required" .Values.backup.cloud.bucketUri | quote }}
-      {{- end }}
-    }
+    {{- $options | toPrettyJson | nindent 4 }}
 {{- end }}

values.yaml

@@ -768,8 +768,8 @@ backup:
   # Ref: https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#time-zones
   timezone: ""
 
-  # Backup options that will be injected as JSON in the default backup options Secret. \
-  # These configurations define the backup behaviour such as including or excluding repositories or system data.
+  # Backup options that will be injected as JSON in the default backup options Secret.
+  # These configurations define the backup behavior such as including or excluding repositories or system data.
   #
   # Ref: https://graphdb.ontotext.com/documentation/11.3/backup-and-restore.html#backup-options
   options: