Merge branch 'main' into K8SPG-712

hors · web-flow · commit f1699d2f0b94 · 2025-04-06T12:19:04.000+03:00
diff --git a/build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml b/build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml
@@ -14023,6 +14023,15 @@ spec:
                 type: boolean
               patroni:
                 properties:
+                  createReplicaMethods:
+                    description: CreateReplicaMethods allows overriding create_replica_methods
+                      for all instances.
+                    items:
+                      enum:
+                      - basebackup
+                      - pgbackrest
+                      type: string
+                    type: array
                   dynamicConfiguration:
                     description: |-
                       Patroni dynamic configuration settings. Changes to this value will be
diff --git a/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml b/build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml
@@ -8072,6 +8072,8 @@ spec:
                         type: boolean
                       pg_stat_monitor:
                         type: boolean
+                      pg_stat_statements:
+                        type: boolean
                       pgvector:
                         type: boolean
                     type: object
@@ -13353,6 +13355,15 @@ spec:
                 type: boolean
               patroni:
                 properties:
+                  createReplicaMethods:
+                    description: CreateReplicaMethods allows overriding create_replica_methods
+                      for all instances.
+                    items:
+                      enum:
+                      - basebackup
+                      - pgbackrest
+                      type: string
+                    type: array
                   dynamicConfiguration:
                     description: |-
                       Patroni dynamic configuration settings. Changes to this value will be
diff --git a/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml b/config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
@@ -8477,6 +8477,8 @@ spec:
                         type: boolean
                       pg_stat_monitor:
                         type: boolean
+                      pg_stat_statements:
+                        type: boolean
                       pgvector:
                         type: boolean
                     type: object
@@ -13758,6 +13760,15 @@ spec:
                 type: boolean
               patroni:
                 properties:
+                  createReplicaMethods:
+                    description: CreateReplicaMethods allows overriding create_replica_methods
+                      for all instances.
+                    items:
+                      enum:
+                      - basebackup
+                      - pgbackrest
+                      type: string
+                    type: array
                   dynamicConfiguration:
                     description: |-
                       Patroni dynamic configuration settings. Changes to this value will be
diff --git a/config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml b/config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml
@@ -13965,6 +13965,15 @@ spec:
                 type: boolean
               patroni:
                 properties:
+                  createReplicaMethods:
+                    description: CreateReplicaMethods allows overriding create_replica_methods
+                      for all instances.
+                    items:
+                      enum:
+                      - basebackup
+                      - pgbackrest
+                      type: string
+                    type: array
                   dynamicConfiguration:
                     description: |-
                       Patroni dynamic configuration settings. Changes to this value will be
diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -8774,6 +8774,8 @@ spec:
                         type: boolean
                       pg_stat_monitor:
                         type: boolean
+                      pg_stat_statements:
+                        type: boolean
                       pgvector:
                         type: boolean
                     type: object
@@ -14055,6 +14057,15 @@ spec:
                 type: boolean
               patroni:
                 properties:
+                  createReplicaMethods:
+                    description: CreateReplicaMethods allows overriding create_replica_methods
+                      for all instances.
+                    items:
+                      enum:
+                      - basebackup
+                      - pgbackrest
+                      type: string
+                    type: array
                   dynamicConfiguration:
                     description: |-
                       Patroni dynamic configuration settings. Changes to this value will be
@@ -39661,6 +39672,15 @@ spec:
                 type: boolean
               patroni:
                 properties:
+                  createReplicaMethods:
+                    description: CreateReplicaMethods allows overriding create_replica_methods
+                      for all instances.
+                    items:
+                      enum:
+                      - basebackup
+                      - pgbackrest
+                      type: string
+                    type: array
                   dynamicConfiguration:
                     description: |-
                       Patroni dynamic configuration settings. Changes to this value will be
diff --git a/deploy/cr.yaml b/deploy/cr.yaml
@@ -495,6 +495,9 @@ spec:
 #          max_worker_processes: 2
 #          shared_buffers: 1GB
 #          work_mem: 2MB
+#    createReplicaMethods:
+#    - pgbackrest
+#    - basebackup
 
 #  extensions:
 #    image: perconalab/percona-postgresql-operator:main
@@ -508,6 +511,7 @@ spec:
 #        name: cluster1-extensions-secret
 #    builtin:
 #      pg_stat_monitor: true
+#      pg_stat_statements: false
 #      pg_audit: true
 #      pgvector: false
 #      pg_repack: false
diff --git a/deploy/crd.yaml b/deploy/crd.yaml
@@ -8774,6 +8774,8 @@ spec:
                         type: boolean
                       pg_stat_monitor:
                         type: boolean
+                      pg_stat_statements:
+                        type: boolean
                       pgvector:
                         type: boolean
                     type: object
@@ -14055,6 +14057,15 @@ spec:
                 type: boolean
               patroni:
                 properties:
+                  createReplicaMethods:
+                    description: CreateReplicaMethods allows overriding create_replica_methods
+                      for all instances.
+                    items:
+                      enum:
+                      - basebackup
+                      - pgbackrest
+                      type: string
+                    type: array
                   dynamicConfiguration:
                     description: |-
                       Patroni dynamic configuration settings. Changes to this value will be
@@ -39661,6 +39672,15 @@ spec:
                 type: boolean
               patroni:
                 properties:
+                  createReplicaMethods:
+                    description: CreateReplicaMethods allows overriding create_replica_methods
+                      for all instances.
+                    items:
+                      enum:
+                      - basebackup
+                      - pgbackrest
+                      type: string
+                    type: array
                   dynamicConfiguration:
                     description: |-
                       Patroni dynamic configuration settings. Changes to this value will be
diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml
@@ -8774,6 +8774,8 @@ spec:
                         type: boolean
                       pg_stat_monitor:
                         type: boolean
+                      pg_stat_statements:
+                        type: boolean
                       pgvector:
                         type: boolean
                     type: object
@@ -14055,6 +14057,15 @@ spec:
                 type: boolean
               patroni:
                 properties:
+                  createReplicaMethods:
+                    description: CreateReplicaMethods allows overriding create_replica_methods
+                      for all instances.
+                    items:
+                      enum:
+                      - basebackup
+                      - pgbackrest
+                      type: string
+                    type: array
                   dynamicConfiguration:
                     description: |-
                       Patroni dynamic configuration settings. Changes to this value will be
@@ -39661,6 +39672,15 @@ spec:
                 type: boolean
               patroni:
                 properties:
+                  createReplicaMethods:
+                    description: CreateReplicaMethods allows overriding create_replica_methods
+                      for all instances.
+                    items:
+                      enum:
+                      - basebackup
+                      - pgbackrest
+                      type: string
+                    type: array
                   dynamicConfiguration:
                     description: |-
                       Patroni dynamic configuration settings. Changes to this value will be
diff --git a/e2e-tests/tests/monitoring-pmm3/06-check-pgstatstatements-query-source.yaml b/e2e-tests/tests/monitoring-pmm3/06-check-pgstatstatements-query-source.yaml
@@ -7,11 +7,19 @@ commands:
 
       source ../../functions
 
-      kubectl -n ${NAMESPACE} patch perconapgcluster/monitoring-pmm3 --type=merge -p '{"spec":{"pmm":{"querySource":"pgstatstatements"}}}'
+      kubectl -n ${NAMESPACE} patch perconapgcluster/monitoring-pmm3 --type=merge -p '{
+        "spec":{
+          "pmm":{"querySource":"pgstatstatements"},
+          "extensions": {"builtin": {"pg_stat_statements": true }}}
+        }
+      '
 
       # Wait for the pg_stat_statements extension to be created
       sleep 80
 
       primary=$(get_pod_by_role monitoring-pmm3 primary name)
-      res=$(kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT extname FROM pg_extension;"')
-      echo ${res} | grep -q pg_stat_statements
+      kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT * FROM pg_extension;"'
+      if ! kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT extname FROM pg_extension;"' | grep pg_stat_statements; then
+        echo "pg_stat_statements is not found in pg_extension"
+      fi
+    timeout: 360
diff --git a/e2e-tests/tests/monitoring/06-check-pgstatstatements-query-source.yaml b/e2e-tests/tests/monitoring/06-check-pgstatstatements-query-source.yaml
@@ -7,12 +7,19 @@ commands:
 
       source ../../functions
 
-      kubectl -n ${NAMESPACE} patch perconapgcluster/monitoring --type=merge -p '{"spec":{"pmm":{"querySource":"pgstatstatements"}}}'
+      kubectl -n ${NAMESPACE} patch perconapgcluster/monitoring --type=merge -p '{
+        "spec":{
+          "pmm":{"querySource":"pgstatstatements"},
+          "extensions": {"builtin": {"pg_stat_statements": true }}}
+        }
+      '
 
       # Wait for the pg_stat_statements extension to be created
       sleep 80
 
       primary=$(get_pod_by_role monitoring primary name)
-      res=$(kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT extname FROM pg_extension;"')
-      echo ${res} | grep -q pg_stat_statements
+      kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT * FROM pg_extension;"'
+      if ! kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT extname FROM pg_extension;"' | grep pg_stat_statements; then
+        echo "pg_stat_statements is not found in pg_extension"
+      fi
     timeout: 360
diff --git a/internal/patroni/config.go b/internal/patroni/config.go
@@ -585,6 +585,14 @@ func instanceYAML(
 		methods = append([]string{pgBackRestCreateReplicaMethod}, methods...)
 	}
 
+	// K8SPG-704: Allow overriding create replica methods list
+	if cluster.Spec.Patroni != nil && len(cluster.Spec.Patroni.CreateReplicaMethods) > 0 {
+		methods = []string{}
+		for _, m := range cluster.Spec.Patroni.CreateReplicaMethods {
+			methods = append(methods, string(m))
+		}
+	}
+
 	// NOTE(cbandy): Is there any chance a user might want to specify their own
 	// method? This is a list and cannot be merged.
 	postgresql["create_replica_methods"] = methods
diff --git a/internal/patroni/config_test.go b/internal/patroni/config_test.go
@@ -976,6 +976,32 @@ postgresql:
   pgpass: /tmp/.pgpass
   use_unix_socket: true
 restapi: {}
+tags: {}
+	`, "\t\n")+"\n")
+
+	cluster.Spec.Patroni.CreateReplicaMethods = []v1beta1.CreateReplicaMethod{"basebackup", "pgbackrest"}
+	dataWithCustomMethods, err := instanceYAML(cluster, instance, nil)
+	assert.NilError(t, err)
+	assert.Equal(t, dataWithCustomMethods, strings.Trim(`
+# Generated by postgres-operator. DO NOT EDIT.
+# Your changes will not be saved.
+bootstrap:
+  initdb:
+  - data-checksums
+  - encoding=UTF8
+  - waldir=/pgdata/pg12_wal
+  - encryption-key-command=echo test
+  method: initdb
+kubernetes: {}
+postgresql:
+  basebackup:
+  - waldir=/pgdata/pg12_wal
+  create_replica_methods:
+  - basebackup
+  - pgbackrest
+  pgpass: /tmp/.pgpass
+  use_unix_socket: true
+restapi: {}
 tags: {}
 	`, "\t\n")+"\n")
 }
diff --git a/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go b/pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go
@@ -225,6 +225,9 @@ func (cr *PerconaPGCluster) Default() {
 	if cr.Spec.Extensions.BuiltIn.PGStatMonitor == nil {
 		cr.Spec.Extensions.BuiltIn.PGStatMonitor = &t
 	}
+	if cr.Spec.Extensions.BuiltIn.PGStatStatements == nil {
+		cr.Spec.Extensions.BuiltIn.PGStatStatements = &f
+	}
 	if cr.Spec.Extensions.BuiltIn.PGAudit == nil {
 		cr.Spec.Extensions.BuiltIn.PGAudit = &t
 	}
@@ -355,6 +358,7 @@ func (cr *PerconaPGCluster) ToCrunchy(ctx context.Context, postgresCluster *crun
 	postgresCluster.Spec.Proxy = cr.Spec.Proxy.ToCrunchy()
 
 	postgresCluster.Spec.Extensions.PGStatMonitor = *cr.Spec.Extensions.BuiltIn.PGStatMonitor
+	postgresCluster.Spec.Extensions.PGStatStatements = *cr.Spec.Extensions.BuiltIn.PGStatStatements
 	postgresCluster.Spec.Extensions.PGAudit = *cr.Spec.Extensions.BuiltIn.PGAudit
 	postgresCluster.Spec.Extensions.PGVector = *cr.Spec.Extensions.BuiltIn.PGVector
 	postgresCluster.Spec.Extensions.PGRepack = *cr.Spec.Extensions.BuiltIn.PGRepack
@@ -605,10 +609,11 @@ type CustomExtensionsStorageSpec struct {
 }
 
 type BuiltInExtensionsSpec struct {
-	PGStatMonitor *bool `json:"pg_stat_monitor,omitempty"`
-	PGAudit       *bool `json:"pg_audit,omitempty"`
-	PGVector      *bool `json:"pgvector,omitempty"`
-	PGRepack      *bool `json:"pg_repack,omitempty"`
+	PGStatMonitor    *bool `json:"pg_stat_monitor,omitempty"`
+	PGStatStatements *bool `json:"pg_stat_statements,omitempty"`
+	PGAudit          *bool `json:"pg_audit,omitempty"`
+	PGVector         *bool `json:"pgvector,omitempty"`
+	PGRepack         *bool `json:"pg_repack,omitempty"`
 }
 
 type ExtensionsSpec struct {
diff --git a/pkg/apis/pgv2.percona.com/v2/zz_generated.deepcopy.go b/pkg/apis/pgv2.percona.com/v2/zz_generated.deepcopy.go
diff --git a/pkg/apis/postgres-operator.crunchydata.com/v1beta1/patroni_types.go b/pkg/apis/postgres-operator.crunchydata.com/v1beta1/patroni_types.go
@@ -42,12 +42,19 @@ type PatroniSpec struct {
 	// +optional
 	Switchover *PatroniSwitchover `json:"switchover,omitempty"`
 
+	// CreateReplicaMethods allows overriding create_replica_methods for all instances.
+	// +optional
+	CreateReplicaMethods []CreateReplicaMethod `json:"createReplicaMethods,omitempty"`
+
 	// TODO(cbandy): Add UseConfigMaps bool, default false.
 	// TODO(cbandy): Allow other DCS: etcd, raft, etc?
 	// N.B. changing this will cause downtime.
 	// - https://patroni.readthedocs.io/en/latest/kubernetes.html
 }
 
+// +kubebuilder:validation:Enum={basebackup,pgbackrest}
+type CreateReplicaMethod string
+
 type PatroniSwitchover struct {
 
 	// Whether or not the operator should allow switchovers in a PostgresCluster
diff --git a/pkg/apis/postgres-operator.crunchydata.com/v1beta1/zz_generated.deepcopy.go b/pkg/apis/postgres-operator.crunchydata.com/v1beta1/zz_generated.deepcopy.go
