Merge branch 'main' into K8SPG-730

Author: hors

e2e-tests/functions

@@ -170,6 +170,7 @@ get_cr() {
 		cr_name=${test_name}
 	fi
 	local repo_path=$2
+	local source_path=$3
 
 	yq eval '
 		.metadata.name = "'${cr_name}'" |
@@ -210,7 +211,7 @@ get_cr() {
 				yq eval -i '
 					.spec.dataSource.pgbackrest.configuration = [{"secret":{"name":"'${test_name}'-pgbackrest-secrets"}}] |
 					.spec.dataSource.pgbackrest.stanza = "db" |
-					.spec.dataSource.pgbackrest.global.repo1-path = "/backrestrepo/postgres-operator/demand-backup-ppg'$PG_VER'/repo1" |
+					.spec.dataSource.pgbackrest.global.repo1-path = "'${source_path}'" |
 					.spec.dataSource.pgbackrest.repo = {"name":"repo1","s3":{"bucket":"'$BUCKET'","endpoint":"s3.amazonaws.com","region":"us-east-1"}}
 					' $TEMP_DIR/cr.yaml
 			fi

e2e-tests/tests/start-from-backup/01-create-source-cluster.yaml

@@ -8,5 +8,6 @@ commands:
 
       source ../../functions
 
-      get_cr "start-from-backup-source" "demand-backup-ppg$PG_VER" \
+      get_cr "start-from-backup-source" ${RANDOM} \
         | kubectl -n "${NAMESPACE}" apply -f -
+ 

e2e-tests/tests/start-from-backup/06-create-cluster.yaml

@@ -7,5 +7,5 @@ commands:
       set -o xtrace
 
       source ../../functions
-
-      get_cr "start-from-backup" ${RANDOM}| kubectl -n "${NAMESPACE}" apply -f -
+      destination=$(kubectl get perconapgbackup -n "${NAMESPACE}" start-from-backup-source-full-s3 -o jsonpath='{.status.destination}' | sed 's/^s3:\/\/pg-operator-testing//g')
+      get_cr "start-from-backup" ${RANDOM} ${destination} | kubectl -n "${NAMESPACE}" apply -f -