K8SPG-637: disable restore on pg-restore deletion

config/rbac/cluster/role.yaml

@@ -101,14 +101,19 @@ rules:
   - delete
   - get
   - list
+  - patch
   - update
   - watch
 - apiGroups:
   - pgv2.percona.com
   resources:
   - perconapgbackups/finalizers
-  - perconapgclusters/finalizers
+  - perconapgclusters/status
+  - perconapgrestores/status
+  - perconapgupgrades/finalizers
+  - perconapgupgrades/status
   verbs:
+  - patch
   - update
 - apiGroups:
   - pgv2.percona.com
@@ -133,12 +138,8 @@ rules:
 - apiGroups:
   - pgv2.percona.com
   resources:
-  - perconapgclusters/status
-  - perconapgrestores/status
-  - perconapgupgrades/finalizers
-  - perconapgupgrades/status
+  - perconapgclusters/finalizers
   verbs:
-  - patch
   - update
 - apiGroups:
   - pgv2.percona.com
@@ -148,6 +149,7 @@ rules:
   - create
   - get
   - list
+  - patch
   - watch
 - apiGroups:
   - policy

config/rbac/namespace/role.yaml

@@ -101,14 +101,19 @@ rules:
   - delete
   - get
   - list
+  - patch
   - update
   - watch
 - apiGroups:
   - pgv2.percona.com
   resources:
   - perconapgbackups/finalizers
-  - perconapgclusters/finalizers
+  - perconapgclusters/status
+  - perconapgrestores/status
+  - perconapgupgrades/finalizers
+  - perconapgupgrades/status
   verbs:
+  - patch
   - update
 - apiGroups:
   - pgv2.percona.com
@@ -133,12 +138,8 @@ rules:
 - apiGroups:
   - pgv2.percona.com
   resources:
-  - perconapgclusters/status
-  - perconapgrestores/status
-  - perconapgupgrades/finalizers
-  - perconapgupgrades/status
+  - perconapgclusters/finalizers
   verbs:
-  - patch
   - update
 - apiGroups:
   - pgv2.percona.com
@@ -148,6 +149,7 @@ rules:
   - create
   - get
   - list
+  - patch
   - watch
 - apiGroups:
   - policy

deploy/bundle.yaml

@@ -45798,14 +45798,19 @@ rules:
   - delete
   - get
   - list
+  - patch
   - update
   - watch
 - apiGroups:
   - pgv2.percona.com
   resources:
   - perconapgbackups/finalizers
-  - perconapgclusters/finalizers
+  - perconapgclusters/status
+  - perconapgrestores/status
+  - perconapgupgrades/finalizers
+  - perconapgupgrades/status
   verbs:
+  - patch
   - update
 - apiGroups:
   - pgv2.percona.com
@@ -45830,12 +45835,8 @@ rules:
 - apiGroups:
   - pgv2.percona.com
   resources:
-  - perconapgclusters/status
-  - perconapgrestores/status
-  - perconapgupgrades/finalizers
-  - perconapgupgrades/status
+  - perconapgclusters/finalizers
   verbs:
-  - patch
   - update
 - apiGroups:
   - pgv2.percona.com
@@ -45845,6 +45846,7 @@ rules:
   - create
   - get
   - list
+  - patch
   - watch
 - apiGroups:
   - policy

deploy/cw-bundle.yaml

@@ -45798,14 +45798,19 @@ rules:
   - delete
   - get
   - list
+  - patch
   - update
   - watch
 - apiGroups:
   - pgv2.percona.com
   resources:
   - perconapgbackups/finalizers
-  - perconapgclusters/finalizers
+  - perconapgclusters/status
+  - perconapgrestores/status
+  - perconapgupgrades/finalizers
+  - perconapgupgrades/status
   verbs:
+  - patch
   - update
 - apiGroups:
   - pgv2.percona.com
@@ -45830,12 +45835,8 @@ rules:
 - apiGroups:
   - pgv2.percona.com
   resources:
-  - perconapgclusters/status
-  - perconapgrestores/status
-  - perconapgupgrades/finalizers
-  - perconapgupgrades/status
+  - perconapgclusters/finalizers
   verbs:
-  - patch
   - update
 - apiGroups:
   - pgv2.percona.com
@@ -45845,6 +45846,7 @@ rules:
   - create
   - get
   - list
+  - patch
   - watch
 - apiGroups:
   - policy

deploy/cw-rbac.yaml

@@ -105,14 +105,19 @@ rules:
   - delete
   - get
   - list
+  - patch
   - update
   - watch
 - apiGroups:
   - pgv2.percona.com
   resources:
   - perconapgbackups/finalizers
-  - perconapgclusters/finalizers
+  - perconapgclusters/status
+  - perconapgrestores/status
+  - perconapgupgrades/finalizers
+  - perconapgupgrades/status
   verbs:
+  - patch
   - update
 - apiGroups:
   - pgv2.percona.com
@@ -137,12 +142,8 @@ rules:
 - apiGroups:
   - pgv2.percona.com
   resources:
-  - perconapgclusters/status
-  - perconapgrestores/status
-  - perconapgupgrades/finalizers
-  - perconapgupgrades/status
+  - perconapgclusters/finalizers
   verbs:
-  - patch
   - update
 - apiGroups:
   - pgv2.percona.com
@@ -152,6 +153,7 @@ rules:
   - create
   - get
   - list
+  - patch
   - watch
 - apiGroups:
   - policy

deploy/rbac.yaml

@@ -105,14 +105,19 @@ rules:
   - delete
   - get
   - list
+  - patch
   - update
   - watch
 - apiGroups:
   - pgv2.percona.com
   resources:
   - perconapgbackups/finalizers
-  - perconapgclusters/finalizers
+  - perconapgclusters/status
+  - perconapgrestores/status
+  - perconapgupgrades/finalizers
+  - perconapgupgrades/status
   verbs:
+  - patch
   - update
 - apiGroups:
   - pgv2.percona.com
@@ -137,12 +142,8 @@ rules:
 - apiGroups:
   - pgv2.percona.com
   resources:
-  - perconapgclusters/status
-  - perconapgrestores/status
-  - perconapgupgrades/finalizers
-  - perconapgupgrades/status
+  - perconapgclusters/finalizers
   verbs:
-  - patch
   - update
 - apiGroups:
   - pgv2.percona.com
@@ -152,6 +153,7 @@ rules:
   - create
   - get
   - list
+  - patch
   - watch
 - apiGroups:
   - policy

e2e-tests/functions

@@ -97,6 +97,23 @@ deploy_operator_gh() {
 		| kubectl -n "${OPERATOR_NS:-$NAMESPACE}" apply -f -
 }
 
+remove_all_finalizers() {
+	resource_types=("pg-restore" "pg-backup" "pg")
+
+	for resource in "${resource_types[@]}"; do
+		echo "removing all finalizers for $resource resources"
+
+		kubectl -n "${NAMESPACE}" get "$resource" -o json | jq '.items[] | .metadata.name' -r | while IFS= read -r name; do
+			kubectl -n "${NAMESPACE}" delete "$resource" "$name" --wait=0
+
+			if [[ $(kubectl -n "${NAMESPACE}" get "$resource" "$name" -o yaml | yq '.metadata.finalizers | length') == "0" ]]; then
+				continue
+			fi
+			kubectl -n "${NAMESPACE}" patch "$resource" "$name" --type=json -p='[{"op": "remove", "path": "/metadata/finalizers"}]'
+		done
+	done
+}
+
 destroy_operator() {
 	kubectl -n "${OPERATOR_NS:-$NAMESPACE}" delete deployment percona-postgresql-operator --force --grace-period=0 || true
 	if [[ $OPERATOR_NS ]]; then
@@ -765,7 +782,7 @@ get_postgresql_logs() {
 
 	for pod in $(kubectl get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do
 		local phase=$(kubectl -n ${NAMESPACE} get ${pod} -o jsonpath={".status.phase"})
-		if [[ "${phase}" != "Running" ]]; then
+		if [[ ${phase} != "Running" ]]; then
 			echo "Waiting for ${pod} to start running"
 			continue
 		fi

e2e-tests/tests/custom-extensions/99-remove-cluster-gracefully.yaml

@@ -16,5 +16,6 @@ commands:
 
       source ../../functions
 
+      remove_all_finalizers
       destroy_operator
     timeout: 60

e2e-tests/tests/custom-tls/99-remove-cluster-gracefully.yaml

@@ -16,5 +16,6 @@ commands:
 
       source ../../functions
 
+      remove_all_finalizers
       destroy_operator
     timeout: 60

e2e-tests/tests/demand-backup/18-assert.yaml

@@ -7,8 +7,6 @@ kind: PostgresCluster
 metadata:
   name: demand-backup
   generation: 10
-  annotations:
-    postgres-operator.crunchydata.com/pgbackrest-restore: demand-backup-restore
   ownerReferences:
     - apiVersion: pgv2.percona.com/v2
       kind: PerconaPGCluster

e2e-tests/tests/demand-backup/19-assert.yaml

@@ -7,8 +7,6 @@ kind: PostgresCluster
 metadata:
   name: demand-backup
   generation: 10
-  annotations:
-    postgres-operator.crunchydata.com/pgbackrest-restore: demand-backup-restore
   ownerReferences:
     - apiVersion: pgv2.percona.com/v2
       kind: PerconaPGCluster
@@ -59,4 +57,4 @@ apiVersion: v1
 metadata:
   name: 19-verify-restored-data
 data:
-  data: ' 100500'
+  data: ' 100500'

e2e-tests/tests/demand-backup/21-assert.yaml

@@ -7,8 +7,6 @@ kind: PostgresCluster
 metadata:
   name: demand-backup
   generation: 12
-  annotations:
-    postgres-operator.crunchydata.com/pgbackrest-restore: demand-backup-restore-azure
   ownerReferences:
     - apiVersion: pgv2.percona.com/v2
       kind: PerconaPGCluster

e2e-tests/tests/demand-backup/22-assert.yaml

@@ -7,8 +7,6 @@ kind: PostgresCluster
 metadata:
   name: demand-backup
   generation: 12
-  annotations:
-    postgres-operator.crunchydata.com/pgbackrest-restore: demand-backup-restore-azure
   ownerReferences:
     - apiVersion: pgv2.percona.com/v2
       kind: PerconaPGCluster
@@ -59,4 +57,4 @@ apiVersion: v1
 metadata:
   name: 22-verify-restored-data
 data:
-  data: ' 100500'
+  data: ' 100500'

e2e-tests/tests/demand-backup/99-remove-cluster-gracefully.yaml

@@ -16,5 +16,6 @@ commands:
 
       source ../../functions
 
+      remove_all_finalizers
       destroy_operator
     timeout: 60

e2e-tests/tests/finalizers/99-remove-cluster-gracefully.yaml

@@ -16,5 +16,6 @@ commands:
 
       source ../../functions
 
+      remove_all_finalizers
       destroy_operator
     timeout: 60

e2e-tests/tests/init-deploy/99-remove-cluster-gracefully.yaml

@@ -16,5 +16,6 @@ commands:
 
       source ../../functions
 
+      remove_all_finalizers
       destroy_operator
     timeout: 60

e2e-tests/tests/major-upgrade/99-remove-cluster-gracefully.yaml

@@ -16,5 +16,6 @@ commands:
 
       source ../../functions
 
+      remove_all_finalizers
       destroy_operator
     timeout: 60

e2e-tests/tests/migration-backup-s3/99-remove-cluster-gracefully.yaml

@@ -16,5 +16,6 @@ commands:
 
       source ../../functions
 
+      remove_all_finalizers
       destroy_operator
     timeout: 60

e2e-tests/tests/migration-data-volumes/99-remove-cluster-gracefully.yaml

@@ -16,5 +16,6 @@ commands:
 
       source ../../functions
 
+      remove_all_finalizers
       destroy_operator
     timeout: 60