K8SPXC-1199 add possibility of restoring backup without container opt…

…ion (#747)
percona · Apr 12, 2023 · 77856a9 · 77856a9
1 parent c447be5
commit 77856a9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/percona-xtradb-cluster-5.7-backup/recovery-cloud.sh b/percona-xtradb-cluster-5.7-backup/recovery-cloud.sh
@@ -21,17 +21,21 @@ if [ -n "$S3_BUCKET_URL" ]; then
 	mc ${MC_ARGS} config host add dest "${ENDPOINT:-https://s3.amazonaws.com}" "$ACCESS_KEY_ID" "$SECRET_ACCESS_KEY"
 	set -x
 	mc ${MC_ARGS} ls "dest/${S3_BUCKET_URL}"
-elif [ -n "${AZURE_CONTAINER_NAME}" ]; then
+elif [ -n "${BACKUP_PATH}" ]; then
 	XBCLOUD_ARGS="${XBCLOUD_ARGS} --storage=azure"
 fi
 
+if [ -n "${AZURE_CONTAINER_NAME}" ]; then
+    XBCLOUD_ARGS="${XBCLOUD_ARGS} --azure-container-name=${AZURE_CONTAINER_NAME}"
+fi
+
 rm -rf /datadir/*
 tmp=$(mktemp --directory /datadir/pxc_sst_XXXX)
 
 destination() {
 	if [ -n "${S3_BUCKET_URL}" ]; then
 		echo -n "s3://${S3_BUCKET_URL}"
-	elif [ -n "${AZURE_CONTAINER_NAME}" ]; then
+	elif [ -n "${BACKUP_PATH}" ]; then
 		echo -n "${BACKUP_PATH}"
 	fi
 }

diff --git a/percona-xtradb-cluster-8.0-backup/recovery-cloud.sh b/percona-xtradb-cluster-8.0-backup/recovery-cloud.sh
@@ -23,17 +23,21 @@ if [ -n "$S3_BUCKET_URL" ]; then
 	mc ${MC_ARGS} config host add dest "${ENDPOINT:-https://s3.amazonaws.com}" "$ACCESS_KEY_ID" "$SECRET_ACCESS_KEY"
 	set -x
 	mc ${MC_ARGS} ls "dest/${S3_BUCKET_URL}"
-elif [ -n "${AZURE_CONTAINER_NAME}" ]; then
+elif [ -n "${BACKUP_PATH}" ]; then
 	XBCLOUD_ARGS="${XBCLOUD_ARGS} --storage=azure"
 fi
 
+if [ -n "${AZURE_CONTAINER_NAME}" ]; then
+    XBCLOUD_ARGS="${XBCLOUD_ARGS} --azure-container-name=${AZURE_CONTAINER_NAME}"
+fi
+
 rm -rf /datadir/*
 tmp=$(mktemp --directory /datadir/pxc_sst_XXXX)
 
 destination() {
 	if [ -n "${S3_BUCKET_URL}" ]; then
 		echo -n "s3://${S3_BUCKET_URL}"
-	elif [ -n "${AZURE_CONTAINER_NAME}" ]; then
+	elif [ -n "${BACKUP_PATH}" ]; then
 		echo -n "${BACKUP_PATH}"
 	fi
 }