Merge pull request #871 from fsoppelsa/check-snapshot-exitcode

Exits with a non-zero code in case Etcd backup fails
openshift · Jul 30, 2022 · 2272cc7 · 2272cc7
2 parents c6db403 + c9540ed
commit 2272cc7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/bindata/etcd/cluster-backup.sh b/bindata/etcd/cluster-backup.sh
@@ -126,5 +126,11 @@ ETCDCTL_ENDPOINTS="https://${NODE_NODE_ENVVAR_NAME_IP}:2379" etcdctl snapshot sa
 
 # Check the integrity of the snapshot
 check_snapshot_status "${SNAPSHOT_FILE}"
+snapshot_failed=$?
+
+# If check_snapshot_status returned 1 it failed, so exit with code 1
+if [[ $snapshot_failed -eq 1 ]]; then
+  exit 1
+fi
 
 echo "snapshot db and kube resources are successfully saved to ${BACKUP_DIR}"
diff --git a/pkg/operator/etcd_assets/bindata.go b/pkg/operator/etcd_assets/bindata.go