Merge branch 'master' into ignore-values

backup/pvc/VERSION.txt

@@ -1 +1 @@
-v0.4.2
+v0.4.3

backup/pvc/bin/backup.sh

@@ -51,6 +51,10 @@ if [[ "$ret" -eq 0 ]]; then
   _log "INFO" "[backup] backup ${BACKUP_NUMBER} was completed without warnings"
 elif [[ "$ret" -eq 1 ]]; then
   _log "INFO" "[backup] backup ${BACKUP_NUMBER} was completed with some warnings"
+else
+  _log "ERROR" "[backup] backup ${BACKUP_NUMBER} failed with error code: $ret"
+  _clean
+  exit "$ret"
 fi
 
 mv "${BACKUP_TMP_DIR}/${BACKUP_NUMBER}.tar.zstd" "${BACKUP_DIR}/${BACKUP_NUMBER}.tar.zstd"

backup/pvc/bin/restore.sh

@@ -39,7 +39,17 @@ else
   exit 1
 fi
 
-tar $OPTS -C "${JENKINS_HOME}" -xf "${BACKUP_DIR}/${BACKUP_NUMBER}.${EXT}"
+tar $OPTS -C "${JENKINS_HOME}" -xf "${BACKUP_DIR}/${BACKUP_NUMBER}.${EXT}" || ret=$?
+
+if [[ "$ret" -eq 0 ]]; then
+  _log "INFO" "[restore] restore ${BACKUP_NUMBER} was completed without warnings"
+elif [[ "$ret" -eq 1 ]]; then
+  _log "INFO" "[restore] restore ${BACKUP_NUMBER} was completed with some warnings"
+else
+  _log "ERROR" "[restore] restore ${BACKUP_NUMBER} failed with error code: $ret"
+  exit "$ret"
+fi
+
 
 _log "INFO" "[restore] deleting lock file ${TRAP_FILE}"
 test -f "${TRAP_FILE}" && rm -f "${TRAP_FILE}"

website/content/en/docs/Getting Started/latest/custom-backup-and-restore.md

@@ -15,7 +15,7 @@ for the Jenkins Operator.
 Two commands (e.g. scripts) are required:
 
 - a backup command, e.g. `backup.sh` that takes one argument, a **backup number**
-- a restore command, e.g. `backup.sh` that takes one argument, a **backup number**
+- a restore command, e.g. `restore.sh` that takes one argument, a **backup number**
 
 Both scripts need to return an exit code of `0` on success and `1` or greater for failure.