K8SPG-648: fix patroni-version-check behaviour on startup (#1081)

* K8SPG-648: fix `patroni-version-check` behaviour on startup

https://perconadev.atlassian.net/browse/K8SPG-648

* better fix

* add `pgv2.percona.com/custom-patroni-version` annotation

* add example into cr.yaml

---------

Co-authored-by: Viacheslav Sarzhan <[email protected]>

Author: 2 people

deploy/cr.yaml

@@ -2,6 +2,8 @@ apiVersion: pgv2.percona.com/v2
 kind: PerconaPGCluster
 metadata:
   name: cluster1
+#  annotations:
+#    pgv2.percona.com/custom-patroni-version: "4"
 #  finalizers:
 #  - percona.com/delete-pvc
 #  - percona.com/delete-ssl

percona/controller/pgcluster/controller.go

@@ -17,6 +17,7 @@ import (
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
@@ -334,9 +335,8 @@ func (r *PGClusterReconciler) reconcilePatroniVersionCheck(ctx context.Context,
 		cr.Annotations = make(map[string]string)
 	}
 
-	// This annotation is used for unit-tests only. Allows to skip the patroni version check
-	if _, ok := cr.Annotations[pNaming.InternalAnnotationDisablePatroniVersionCheck]; ok {
-		cr.Annotations[pNaming.AnnotationPatroniVersion] = cr.Status.PatroniVersion
+	if patroniVersion, ok := cr.Annotations[pNaming.AnnotationCustomPatroniVersion]; ok {
+		cr.Annotations[pNaming.AnnotationPatroniVersion] = patroniVersion
 		return nil
 	}
 
@@ -371,7 +371,7 @@ func (r *PGClusterReconciler) reconcilePatroniVersionCheck(ctx context.Context,
 
 	// 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 slices.Contains(imageIDs, cr.Status.Postgres.ImageID) && cr.Status.PatroniVersion != "" {
+	if (len(imageIDs) == 0 || slices.Contains(imageIDs, cr.Status.Postgres.ImageID)) && cr.Status.PatroniVersion != "" {
 		cr.Annotations[pNaming.AnnotationPatroniVersion] = cr.Status.PatroniVersion
 		return nil
 	}
@@ -404,13 +404,23 @@ func (r *PGClusterReconciler) reconcilePatroniVersionCheck(ctx context.Context,
 							"bash",
 						},
 						Args: []string{
-							"-c", "sleep 300",
+							"-c", "sleep 60",
 						},
 						Resources: cr.Spec.InstanceSets[0].Resources,
 					},
 				},
 				SecurityContext:               cr.Spec.InstanceSets[0].SecurityContext,
 				TerminationGracePeriodSeconds: ptr.To(int64(5)),
+				Resources: &corev1.ResourceRequirements{
+					Limits: corev1.ResourceList{
+						corev1.ResourceCPU:    resource.MustParse("100m"),
+						corev1.ResourceMemory: resource.MustParse("64Mi"),
+					},
+					Requests: corev1.ResourceList{
+						corev1.ResourceCPU:    resource.MustParse("50m"),
+						corev1.ResourceMemory: resource.MustParse("32Mi"),
+					},
+				},
 			},
 		}
 

percona/controller/pgcluster/testutils_test.go

@@ -98,9 +98,8 @@ func readTestCR(name, namespace, testFile string) (*v2.PerconaPGCluster, error)
 	if cr.Annotations == nil {
 		cr.Annotations = make(map[string]string)
 	}
-	cr.Annotations[pNaming.InternalAnnotationDisablePatroniVersionCheck] = "true"
+	cr.Annotations[pNaming.AnnotationCustomPatroniVersion] = "4.0.0"
 	cr.Status.Postgres.Version = cr.Spec.PostgresVersion
-	cr.Status.PatroniVersion = "4.0.0"
 	return cr, nil
 }
 
@@ -120,10 +119,9 @@ func readDefaultCR(name, namespace string) (*v2.PerconaPGCluster, error) {
 	if cr.Annotations == nil {
 		cr.Annotations = make(map[string]string)
 	}
-	cr.Annotations[pNaming.InternalAnnotationDisablePatroniVersionCheck] = "true"
+	cr.Annotations[pNaming.AnnotationCustomPatroniVersion] = "4.0.0"
 	cr.Namespace = namespace
 	cr.Status.Postgres.Version = cr.Spec.PostgresVersion
-	cr.Status.PatroniVersion = "4.0.0"
 	return cr, nil
 }
 

percona/naming/annotations.go

@@ -40,6 +40,6 @@ const (
 
 	AnnotationPatroniVersion = PrefixPerconaPGV2 + "patroni-version"
 
-	// Should be used only for unit-testing
-	InternalAnnotationDisablePatroniVersionCheck = PrefixPerconaInternal + "patroni-version-check-disable"
+	// Special annotation to disable `patroni-version-check` by overriding the patroni version with a custom value.
+	AnnotationCustomPatroniVersion = PrefixPerconaPGV2 + "custom-patroni-version"
 )