K8SPG-883 support cr.Status.PatroniVersion and cr.Status.Patroni.Version

build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml

@@ -21143,6 +21143,10 @@ spec:
                   version:
                     type: string
                 type: object
+              patroniVersion:
+                description: 'Deprecated: Use Patroni instead. This field will be
+                  removed in a future release.'
+                type: string
               pgbackrest:
                 description: Status information for pgBackRest
                 properties:

config/crd/bases/pgv2.percona.com_perconapgclusters.yaml

@@ -21548,6 +21548,10 @@ spec:
                   version:
                     type: string
                 type: object
+              patroniVersion:
+                description: 'Deprecated: Use Patroni instead. This field will be
+                  removed in a future release.'
+                type: string
               pgbackrest:
                 description: Status information for pgBackRest
                 properties:

deploy/bundle.yaml

@@ -21845,6 +21845,10 @@ spec:
                   version:
                     type: string
                 type: object
+              patroniVersion:
+                description: 'Deprecated: Use Patroni instead. This field will be
+                  removed in a future release.'
+                type: string
               pgbackrest:
                 description: Status information for pgBackRest
                 properties:

deploy/crd.yaml

@@ -21845,6 +21845,10 @@ spec:
                   version:
                     type: string
                 type: object
+              patroniVersion:
+                description: 'Deprecated: Use Patroni instead. This field will be
+                  removed in a future release.'
+                type: string
               pgbackrest:
                 description: Status information for pgBackRest
                 properties:

deploy/cw-bundle.yaml

@@ -21845,6 +21845,10 @@ spec:
                   version:
                     type: string
                 type: object
+              patroniVersion:
+                description: 'Deprecated: Use Patroni instead. This field will be
+                  removed in a future release.'
+                type: string
               pgbackrest:
                 description: Status information for pgBackRest
                 properties:

percona/controller/pgcluster/controller.go

@@ -374,8 +374,6 @@ 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{
@@ -388,10 +386,17 @@ func (r *PGClusterReconciler) reconcilePatroniVersionCheck(ctx context.Context,
 			orig := cluster.DeepCopy()
 
 			cluster.Status.Patroni.Version = patroniVersion
+			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")
 			}
+
+			err := r.patchPatroniVersionAnnotation(ctx, cr, patroniVersion)
+			if err != nil {
+				return errors.Wrap(err, "failed to patch patroni version annotation")
+			}
+
 			return nil
 		}
 
@@ -403,40 +408,29 @@ func (r *PGClusterReconciler) reconcilePatroniVersionCheck(ctx context.Context,
 		return nil
 	}
 
-	getImageIDFromPod := func(pod *corev1.Pod, containerName string) string {
-		idx := slices.IndexFunc(pod.Status.ContainerStatuses, func(s corev1.ContainerStatus) bool {
-			return s.Name == containerName
-		})
-		if idx == -1 {
-			return ""
-		}
-		return pod.Status.ContainerStatuses[idx].ImageID
-	}
-
-	pods := new(corev1.PodList)
-	instances, err := naming.AsSelector(naming.ClusterInstances(cr.Name))
+	imageIDs, err := r.instanceImageIDs(ctx, cr)
 	if err != nil {
-		return err
-	}
-	if err = r.Client.List(ctx, pods, client.InNamespace(cr.Namespace), client.MatchingLabelsSelector{Selector: instances}); err != nil {
-		return err
-	}
-
-	// Collecting all image IDs from instance pods. Under normal conditions, this slice will contain a single image ID, as all pods typically use the same image.
-	// During an image update, it may contain multiple different image IDs as the update progresses.
-	imageIDs := []string{}
-	for _, pod := range pods.Items {
-		imageID := getImageIDFromPod(&pod, naming.ContainerDatabase)
-		if imageID != "" && !slices.Contains(imageIDs, imageID) {
-			imageIDs = append(imageIDs, imageID)
-		}
+		return errors.Wrap(err, "get image IDs")
 	}
 
 	// If the imageIDs slice contains the imageID from the status, we skip checking the Patroni version.
 	// This ensures that the Patroni version is only checked after all pods have been updated.
-	if (len(imageIDs) == 0 || slices.Contains(imageIDs, cr.Status.Postgres.ImageID)) && cr.Status.Patroni.Version != "" {
-		cr.Annotations[pNaming.AnnotationPatroniVersion] = cr.Status.Patroni.Version
-		return nil
+	if cr.CompareVersion("2.8.0") >= 0 {
+		if (len(imageIDs) == 0 || slices.Contains(imageIDs, cr.Status.Postgres.ImageID)) && cr.Status.Patroni.Version != "" {
+			err = r.patchPatroniVersionAnnotation(ctx, cr, cr.Status.Patroni.Version)
+			if err != nil {
+				return errors.Wrap(err, "failed to patch patroni version annotation")
+			}
+			return nil
+		}
+	} else {
+		if (len(imageIDs) == 0 || slices.Contains(imageIDs, cr.Status.Postgres.ImageID)) && cr.Status.PatroniVersion != "" {
+			err = r.patchPatroniVersionAnnotation(ctx, cr, cr.Status.PatroniVersion)
+			if err != nil {
+				return errors.Wrap(err, "failed to patch patroni version annotation")
+			}
+			return nil
+		}
 	}
 
 	meta := metav1.ObjectMeta{
@@ -535,21 +529,68 @@ func (r *PGClusterReconciler) reconcilePatroniVersionCheck(ctx context.Context,
 	orig := cr.DeepCopy()
 
 	cr.Status.Patroni.Version = patroniVersion
+	cr.Status.PatroniVersion = patroniVersion
 	cr.Status.Postgres.Version = cr.Spec.PostgresVersion
 	cr.Status.Postgres.ImageID = getImageIDFromPod(p, pNaming.ContainerPatroniVersionCheck)
 
 	if err := r.Client.Status().Patch(ctx, cr.DeepCopy(), client.MergeFrom(orig)); err != nil {
 		return errors.Wrap(err, "failed to patch patroni version")
 	}
 
+	err = r.patchPatroniVersionAnnotation(ctx, cr, patroniVersion)
+	if err != nil {
+		return errors.Wrap(err, "failed to patch patroni version annotation")
+	}
+
 	if err := r.Client.Delete(ctx, p); err != nil {
 		return errors.Wrap(err, "failed to delete patroni version check pod")
 	}
-	cr.Annotations[pNaming.AnnotationPatroniVersion] = patroniVersion
 
 	return nil
 }
 
+func (r *PGClusterReconciler) patchPatroniVersionAnnotation(ctx context.Context, cr *v2.PerconaPGCluster, patroniVersion string) error {
+	orig := cr.DeepCopy()
+	cr.Annotations[pNaming.AnnotationPatroniVersion] = patroniVersion
+	if err := r.Client.Patch(ctx, cr.DeepCopy(), client.MergeFrom(orig)); err != nil {
+		return errors.Wrap(err, "failed to patch the pg cluster")
+	}
+	return nil
+}
+
+func (r *PGClusterReconciler) instanceImageIDs(ctx context.Context, cr *v2.PerconaPGCluster) ([]string, error) {
+	pods := new(corev1.PodList)
+	instances, err := naming.AsSelector(naming.ClusterInstances(cr.Name))
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to create a selector for instance pods")
+	}
+	if err = r.Client.List(ctx, pods, client.InNamespace(cr.Namespace), client.MatchingLabelsSelector{Selector: instances}); err != nil {
+		return nil, errors.Wrap(err, "failed to list instances")
+	}
+
+	// Collecting all image IDs from instance pods. Under normal conditions, this slice will contain a single image ID, as all pods typically use the same image.
+	// During an image update, it may contain multiple different image IDs as the update progresses.
+	var imageIDs []string
+	for _, pod := range pods.Items {
+		imageID := getImageIDFromPod(&pod, naming.ContainerDatabase)
+		if imageID != "" && !slices.Contains(imageIDs, imageID) {
+			imageIDs = append(imageIDs, imageID)
+		}
+	}
+
+	return imageIDs, nil
+}
+
+func getImageIDFromPod(pod *corev1.Pod, containerName string) string {
+	idx := slices.IndexFunc(pod.Status.ContainerStatuses, func(s corev1.ContainerStatus) bool {
+		return s.Name == containerName
+	})
+	if idx == -1 {
+		return ""
+	}
+	return pod.Status.ContainerStatuses[idx].ImageID
+}
+
 func (r *PGClusterReconciler) reconcileTLS(ctx context.Context, cr *v2.PerconaPGCluster) error {
 	if err := r.validateTLS(ctx, cr); err != nil {
 		return errors.Wrap(err, "validate TLS")

percona/controller/pgcluster/controller_test.go

@@ -2079,6 +2079,8 @@ var _ = Describe("patroni version check", Ordered, func() {
 			Expect(k8sClient.Get(ctx, crNamespacedName, updatedCR)).Should(Succeed())
 
 			Expect(updatedCR.Status.Patroni.Version).To(Equal("3.2.1"))
+			Expect(updatedCR.Status.PatroniVersion).To(Equal("3.2.1"))
+			Expect(updatedCR.Annotations[pNaming.AnnotationPatroniVersion]).To(Equal("3.2.1"))
 		})
 	})
 
@@ -2134,7 +2136,9 @@ var _ = Describe("patroni version check", Ordered, func() {
 			}
 
 			cr2.Status.Patroni.Version = "3.1.0"
+			cr2.Status.PatroniVersion = "3.1.0"
 			cr2.Status.Postgres.ImageID = "some-image-id"
+			cr2.Annotations[pNaming.AnnotationPatroniVersion] = "3.1.0"
 
 			status := cr2.Status
 			Expect(k8sClient.Create(ctx, cr2)).Should(Succeed())
@@ -2240,6 +2244,8 @@ var _ = Describe("patroni version check", Ordered, func() {
 			Expect(k8sClient.Get(ctx, crNamespacedName2, updatedCR)).Should(Succeed())
 
 			Expect(updatedCR.Status.Patroni.Version).To(Equal("3.1.0"))
+			Expect(updatedCR.Status.PatroniVersion).To(Equal("3.1.0"))
+			Expect(updatedCR.Annotations[pNaming.AnnotationPatroniVersion]).To(Equal("3.1.0"))
 		})
 	})
 })

percona/postgres/common.go

@@ -17,7 +17,13 @@ func GetPrimaryPod(ctx context.Context, cli client.Client, cr *v2.PerconaPGClust
 	// K8SPG-648: patroni v4.0.0 deprecated "master" role.
 	//            We should use "primary" instead
 	role := "primary"
-	patroniVer, err := gover.NewVersion(cr.Status.Patroni.Version)
+
+	patroniVersion := cr.Status.PatroniVersion
+	if cr.CompareVersion("2.8.0") >= 0 {
+		patroniVersion = cr.Status.Patroni.Version
+	}
+
+	patroniVer, err := gover.NewVersion(patroniVersion)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to get patroni version")
 	}

percona/watcher/wal_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/percona/percona-postgresql-operator/v2/percona/version"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -343,6 +344,9 @@ func TestGetLatestCommitTimestamp(t *testing.T) {
 						Version: "error",
 					},
 				},
+				Spec: pgv2.PerconaPGClusterSpec{
+					CRVersion: version.Version(),
+				},
 			},
 			expectedErr: errors.New("failed to get patroni version: Malformed version: error: primary pod not found"),
 		},

pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go

@@ -442,6 +442,11 @@ type PerconaPGClusterStatus struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=status
 	State AppState `json:"state"`
 
+	// +optional
+	// +operator-sdk:csv:customresourcedefinitions:type=status
+	// Deprecated: Use Patroni instead. This field will be removed in a future release.
+	PatroniVersion string `json:"patroniVersion"`
+
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=status
 	Patroni Patroni `json:"patroni,omitempty"`