Merge branch 'main' into dependabot/go_modules/google.golang.org/grpc-1.73.0

Author: hors

.e2eignore

@@ -7,4 +7,6 @@ CONTRIBUTING.md
 LICENSE.md
 README.md
 .gitignore
-release_versions
+release_versions
+.e2eignore
+.snyk

.snyk

@@ -0,0 +1,10 @@
+#SNYK - percona/percona-postgresql-operator
+
+exclude:
+  global:
+  - e2e-tests/**
+  - testing/**
+
+version: v1.25.0
+ignore: {}
+patch: {}

percona/controller/pgcluster/controller.go

@@ -337,6 +337,31 @@ func (r *PGClusterReconciler) reconcilePatroniVersionCheck(ctx context.Context,
 
 	if patroniVersion, ok := cr.Annotations[pNaming.AnnotationCustomPatroniVersion]; ok {
 		cr.Annotations[pNaming.AnnotationPatroniVersion] = patroniVersion
+
+		patroniVersionUpdateFunc := func() error {
+			cluster := &v2.PerconaPGCluster{}
+			if err := r.Client.Get(ctx, types.NamespacedName{
+				Name:      cr.Name,
+				Namespace: cr.Namespace,
+			}, cluster); err != nil {
+				return errors.Wrap(err, "get PerconaPGCluster")
+			}
+
+			orig := cluster.DeepCopy()
+
+			cluster.Status.PatroniVersion = patroniVersion
+
+			if err := r.Client.Status().Patch(ctx, cluster.DeepCopy(), client.MergeFrom(orig)); err != nil {
+				return errors.Wrap(err, "failed to patch patroni version")
+			}
+			return nil
+		}
+
+		// To ensure that the update was done given that conflicts can be caused by
+		// other code making unrelated updates to the same resource at the same time.
+		if err := retry.RetryOnConflict(retry.DefaultRetry, patroniVersionUpdateFunc); err != nil {
+			return errors.Wrap(err, "failed to patch patroni version")
+		}
 		return nil
 	}