small improvements

Author: pooknull

internal/controller/postgrescluster/instance.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 	"time"
 
-	gover "github.com/hashicorp/go-version"
 	"github.com/pkg/errors"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
@@ -38,7 +37,6 @@ import (
 	"github.com/percona/percona-postgresql-operator/internal/pgbackrest"
 	"github.com/percona/percona-postgresql-operator/internal/pki"
 	"github.com/percona/percona-postgresql-operator/internal/postgres"
-	pNaming "github.com/percona/percona-postgresql-operator/percona/naming"
 	"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
@@ -811,15 +809,10 @@ func (r *Reconciler) rolloutInstance(
 		ctx, span = r.Tracer.Start(ctx, "patroni-change-primary")
 		defer span.End()
 
-		patroniVerStr, ok := cluster.Annotations[pNaming.ToCrunchyAnnotation(pNaming.AnnotationPatroniVersion)]
-		if !ok {
-			return errors.New("patroni version annotation was not found")
-		}
-		patroniVer, err := gover.NewVersion(patroniVerStr)
+		patroniVer4, err := cluster.IsPatroniVer4()
 		if err != nil {
-			return errors.Wrap(err, "failed to get patroni ver")
+			return errors.Wrap(err, "failed to check if patroni v4 is used")
 		}
-		patroniVer4 := patroniVer.Compare(gover.Must(gover.NewVersion("4.0.0"))) >= 0
 
 		success, err := patroni.Executor(exec).ChangePrimaryAndWait(ctx, pod.Name, "", patroniVer4)
 		if err = errors.WithStack(err); err == nil && !success {

internal/controller/postgrescluster/patroni.go

@@ -10,7 +10,6 @@ import (
 	"io"
 	"time"
 
-	gover "github.com/hashicorp/go-version"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -23,7 +22,6 @@ import (
 	"github.com/percona/percona-postgresql-operator/internal/patroni"
 	"github.com/percona/percona-postgresql-operator/internal/pki"
 	"github.com/percona/percona-postgresql-operator/internal/postgres"
-	pNaming "github.com/percona/percona-postgresql-operator/percona/naming"
 	"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
@@ -96,15 +94,10 @@ func (r *Reconciler) handlePatroniRestarts(
 			return r.PodExec(ctx, pod.Namespace, pod.Name, container, stdin, stdout, stderr, command...)
 		})
 
-		patroniVerStr, ok := cluster.Annotations[pNaming.ToCrunchyAnnotation(pNaming.AnnotationPatroniVersion)]
-		if !ok {
-			return errors.New("patroni version annotation was not found")
-		}
-		patroniVer, err := gover.NewVersion(patroniVerStr)
+		patroniVer4, err := cluster.IsPatroniVer4()
 		if err != nil {
-			return errors.Wrap(err, "failed to get patroni ver")
+			return errors.Wrap(err, "failed to check if patroni v4 is used")
 		}
-		patroniVer4 := patroniVer.Compare(gover.Must(gover.NewVersion("4.0.0"))) >= 0
 
 		// K8SPG-648: patroni v4.0.0 deprecated "master" role.
 		//            We should use "primary" instead

internal/patroni/api.go

@@ -45,10 +45,13 @@ func (exec Executor) ChangePrimaryAndWait(
 
 	// K8SPG-648: patroni v4.0.0 deprecated "master" role.
 	//            We should use "primary" instead
-	cmd := []string{"patronictl", "switchover", "--scheduled=now", "--force", "--primary=" + current, "--candidate=" + next}
-	if !patroniVer4 {
-		cmd = []string{"patronictl", "switchover", "--scheduled=now", "--force", "--master=" + current, "--candidate=" + next}
+	cmd := []string{"patronictl", "switchover", "--scheduled=now", "--force", "--candidate=" + next}
+	if patroniVer4 {
+		cmd = append(cmd, "--primary="+current)
+	} else {
+		cmd = append(cmd, "--master="+current)
 	}
+
 	err := exec(ctx, nil, &stdout, &stderr, cmd...)
 
 	log := logging.FromContext(ctx)

internal/patroni/config.go

@@ -5,19 +5,16 @@
 package patroni
 
 import (
-	"errors"
 	"fmt"
 	"path"
 	"strings"
 
-	gover "github.com/hashicorp/go-version"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/yaml"
 
 	"github.com/percona/percona-postgresql-operator/internal/config"
 	"github.com/percona/percona-postgresql-operator/internal/naming"
 	"github.com/percona/percona-postgresql-operator/internal/postgres"
-	pNaming "github.com/percona/percona-postgresql-operator/percona/naming"
 	"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
@@ -573,13 +570,10 @@ func instanceYAML(
 		}
 		// K8SPG-648: patroni v4.0.0 deprecated "no_master".
 		//            We should use "no_leader" instead
-
-		patroniVerStr, ok := cluster.Annotations[pNaming.ToCrunchyAnnotation(pNaming.AnnotationPatroniVersion)]
-		if !ok {
-			return "", errors.New("patroni version annotation was not found")
+		patroniVer4, err := cluster.IsPatroniVer4()
+		if err != nil {
+			return "", fmt.Errorf("failed to check if patroni v4 is used: %w", err)
 		}
-		patroniVer := gover.Must(gover.NewVersion(patroniVerStr))
-		patroniVer4 := patroniVer.Compare(gover.Must(gover.NewVersion("4.0.0"))) >= 0
 		if !patroniVer4 {
 			postgresql[pgBackRestCreateReplicaMethod] = map[string]any{
 				"command":   strings.Join(quoted, " "),

pkg/apis/postgres-operator.crunchydata.com/v1beta1/postgrescluster_types.go

@@ -8,9 +8,12 @@ import (
 	"fmt"
 
 	gover "github.com/hashicorp/go-version"
+	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+
+	pNaming "github.com/percona/percona-postgresql-operator/percona/naming"
 )
 
 // PostgresClusterSpec defines the desired state of PostgresCluster
@@ -747,3 +750,16 @@ func (cr *PostgresCluster) CompareVersion(ver string) int {
 	}
 	return crVersion.Compare(gover.Must(gover.NewVersion(ver)))
 }
+
+// K8SPG-692
+func (cr *PostgresCluster) IsPatroniVer4() (bool, error) {
+	patroniVerStr, ok := cr.Annotations[pNaming.ToCrunchyAnnotation(pNaming.AnnotationPatroniVersion)]
+	if !ok {
+		return false, errors.New("patroni version annotation was not found")
+	}
+	patroniVer, err := gover.NewVersion(patroniVerStr)
+	if err != nil {
+		return false, errors.Wrap(err, "failed to get patroni ver")
+	}
+	return patroniVer.Compare(gover.Must(gover.NewVersion("4.0.0"))) >= 0, nil
+}