@@ -10,7 +10,7 @@ IMAGE_MONGOD_CHAIN=${IMAGE_MONGOD_CHAIN:-$'
1010perconalab/percona-server-mongodb-operator:main-mongod6.0
1111perconalab/percona-server-mongodb-operator:main-mongod7.0
1212perconalab/percona-server-mongodb-operator:main-mongod8.0' }
13- IMAGE_BACKUP=${IMAGE_BACKUP:- " perconalab /percona-server-mongodb-operator:main-backup " }
13+ IMAGE_BACKUP=${IMAGE_BACKUP:- " percona /percona-server-mongodb-operator:2.11.0 " }
1414SKIP_BACKUPS_TO_AWS_GCP_AZURE=${SKIP_BACKUPS_TO_AWS_GCP_AZURE:- 1}
1515PMM_SERVER_VER=${PMM_SERVER_VER:- " 9.9.9" }
1616IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:- " percona/pmm-client:2.44.1-1" }
@@ -1592,9 +1592,10 @@ function check_backup_deletion_aws() {
15921592
15931593function check_backup_deletion_gcs() {
15941594 backup_dest_gcp=$1
1595- storage_name=" gcp-cs"
1596- retry=0
1597- gcs_path=" gs://${backup_dest_gcp} "
1595+ obj=$2
1596+ storage_name=" gcp-cs"
1597+ retry=0
1598+ gcs_path=" gs://${backup_dest_gcp}${obj} "
15981599
15991600 while gsutil ls " $gcs_path " > /dev/null 2>&1 ; do
16001601 if [ $retry -ge 15 ]; then
@@ -1611,8 +1612,10 @@ function check_backup_deletion_gcs() {
16111612}
16121613
16131614function check_backup_deletion_azure() {
1614- container=$( echo " $1 " | cut -d' /' -f1)
1615- blob_prefix=$( echo " $1 " | cut -d' /' -f2-)
1615+ url_path=$( echo " $1 " | sed ' s|https://[^/]*\.blob\.core\.windows\.net/||' )
1616+ container=$( echo " $url_path " | cut -d' /' -f1)
1617+ blob_prefix=$( echo " $url_path " | cut -d' /' -f2-)
1618+
16161619 blob=$2
16171620 storage_name=" azure-blob"
16181621 retry=0
@@ -2412,7 +2415,7 @@ check_backup_in_storage() {
24122415 gcs)
24132416 endpoint=" storage.googleapis.com"
24142417 setup_gcs_credentials
2415- check_backup_existence_gcs " $backup_dest " " /${replset} /${file} "
2418+ check_backup_existence_gcs " $backup_dest " " /${replset} /${file} "
24162419 ;;
24172420 azure)
24182421 endpoint=" engk8soperators.blob.core.windows.net"
0 commit comments