Merge branch 'main' into cloud-881

percona · Feb 10, 2025 · e37b58f · e37b58f
2 parents 52a2a9e + 7a64257
commit e37b58f
Show file tree

Hide file tree

Showing 86 changed files with 939 additions and 463 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,4 +15,4 @@ jobs:
       - name: Basic tests
         run: make check
       - name: envtest
-        run: ENVTEST_K8S_VERSION=1.28 make check-envtest
+        run: ENVTEST_K8S_VERSION=1.32 make check-envtest
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -315,8 +315,14 @@ void checkE2EIgnoreFiles() {
         echo "This is the first run. Using merge base as the starting point for the diff."
         changedFiles = sh(script: "git diff --name-only \$(git merge-base HEAD origin/$CHANGE_TARGET)", returnStdout: true).trim().split('\n').findAll{it}
     } else {
-        echo "Processing changes since last processed commit: $lastProcessedCommitHash"
-        changedFiles = sh(script: "git diff --name-only $lastProcessedCommitHash HEAD", returnStdout: true).trim().split('\n').findAll{it}
+        def commitExists = sh(script: "git cat-file -e $lastProcessedCommitHash 2>/dev/null", returnStatus: true) == 0
+        if (commitExists) {
+            echo "Processing changes since last processed commit: $lastProcessedCommitHash"
+            changedFiles = sh(script: "git diff --name-only $lastProcessedCommitHash HEAD", returnStdout: true).trim().split('\n').findAll{it}
+        } else {
+            echo "Commit hash $lastProcessedCommitHash does not exist in the current repository. Using merge base as the starting point for the diff."
+            changedFiles = sh(script: "git diff --name-only \$(git merge-base HEAD origin/$CHANGE_TARGET)", returnStdout: true).trim().split('\n').findAll{it}
+        }
     }
 
     echo "Excluded files: $excludedFiles"
@@ -328,7 +334,7 @@ void checkE2EIgnoreFiles() {
     if (needToRunTests) {
         echo "Some changed files are outside of the e2eignore list. Proceeding with execution."
     } else {
-        if (currentBuild.previousBuild?.result in ['FAILURE', 'ABORTED', 'UNSTABLE']) {
+        if (currentBuild.previousBuild?.result != 'SUCCESS') {
             echo "All changed files are e2eignore files, and previous build was unsuccessful. Propagating previous state."
             currentBuild.result = currentBuild.previousBuild?.result
             error "Skipping execution as non-significant changes detected and previous build was unsuccessful."

diff --git a/config/rbac/cluster/role.yaml b/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

diff --git a/config/rbac/namespace/role.yaml b/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

diff --git a/deploy/bundle.yaml b/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

diff --git a/deploy/cw-bundle.yaml b/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

diff --git a/deploy/cw-rbac.yaml b/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

diff --git a/deploy/rbac.yaml b/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

diff --git a/e2e-tests/functions b/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

diff --git a/e2e-tests/tests/custom-extensions/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/custom-extensions/99-remove-cluster-gracefully.yaml
@@ -16,5 +16,6 @@ commands:
 
       source ../../functions
 
+      remove_all_finalizers
       destroy_operator
     timeout: 60
diff --git a/e2e-tests/tests/custom-tls/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/custom-tls/99-remove-cluster-gracefully.yaml
@@ -16,5 +16,6 @@ commands:
 
       source ../../functions
 
+      remove_all_finalizers
       destroy_operator
     timeout: 60
diff --git a/e2e-tests/tests/demand-backup/01-create-cluster.yaml b/e2e-tests/tests/demand-backup/01-create-cluster.yaml
@@ -14,4 +14,6 @@ commands:
         | yq '.spec.backups.pgbackrest.global.repo1-retention-full-type="count"' \
         | yq '.spec.backups.pgbackrest.global.repo3-retention-full="2"' \
         | yq '.spec.backups.pgbackrest.global.repo3-retention-full-type="count"' \
+        | yq '.spec.backups.pgbackrest.jobs.backoffLimit=20' \
+        | yq '.spec.backups.pgbackrest.jobs.restartPolicy="OnFailure"' \
         | kubectl -n "${NAMESPACE}" apply -f -