Merge pull request #264 from vshn/disableConnectionPooling

Allow to disable PgBouncer in VSHNPostgreSQL
vshn · Nov 18, 2024 · 5fe18eb · 5fe18eb
2 parents fc026b1 + dd1feba
commit 5fe18eb
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 0 deletions.
diff --git a/apis/vshn/v1/dbaas_vshn_postgresql.go b/apis/vshn/v1/dbaas_vshn_postgresql.go
@@ -2,6 +2,7 @@ package v1
 
 import (
 	"fmt"
+
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
 	sgv1 "github.com/vshn/appcat/v4/apis/stackgres/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -147,6 +148,10 @@ type VSHNPostgreSQLServiceSpec struct {
 	// PgBouncerSettings passes additional configuration to the pgBouncer instance.
 	PgBouncerSettings *sgv1.SGPoolingConfigSpecPgBouncerPgbouncerIni `json:"pgBouncerSettings,omitempty"`
 
+	// Disable connection pooling service PgBouncer. All connections will go straight to PostgreSQL instance.
+	// +kubebuilder:default=false
+	DisablePgBouncer bool `json:"DisablePgBouncer,omitempty"`
+
 	// +kubebuilder:default=true
 	// This is default option if neither repack or vacuum are selected
 	RepackEnabled bool `json:"repackEnabled,omitempty"`

diff --git a/crds/vshn.appcat.vshn.io_vshnkeycloaks.yaml b/crds/vshn.appcat.vshn.io_vshnkeycloaks.yaml
@@ -9775,6 +9775,10 @@ spec:
                             service:
                               description: Service contains PostgreSQL DBaaS specific properties
                               properties:
+                                DisablePgBouncer:
+                                  default: false
+                                  description: Disable connection pooling service PgBouncer. All connections will go straight to PostgreSQL instance.
+                                  type: boolean
                                 access:
                                   description: Access defines additional users and databases for this instance.
                                   items:

diff --git a/crds/vshn.appcat.vshn.io_vshnnextclouds.yaml b/crds/vshn.appcat.vshn.io_vshnnextclouds.yaml
@@ -4852,11 +4852,14 @@ spec:
                       description: Service contains nextcloud DBaaS specific properties
                       properties:
                         collabora:
+                          description: Collabora contains settings to control the Collabora integration.
                           properties:
                             enabled:
                               default: false
+                              description: Enabled enables the Collabora integration. It will autoconfigure the Collabora server URL in Your Nextcloud instance.
                               type: boolean
                             fqdn:
+                              description: FQDN contains the FQDN of the Collabora server. This is used to configure the Collabora server URL in Your Nextcloud instance.
                               type: string
                           required:
                             - enabled
@@ -9751,6 +9754,10 @@ spec:
                             service:
                               description: Service contains PostgreSQL DBaaS specific properties
                               properties:
+                                DisablePgBouncer:
+                                  default: false
+                                  description: Disable connection pooling service PgBouncer. All connections will go straight to PostgreSQL instance.
+                                  type: boolean
                                 access:
                                   description: Access defines additional users and databases for this instance.
                                   items:

diff --git a/crds/vshn.appcat.vshn.io_vshnpostgresqls.yaml b/crds/vshn.appcat.vshn.io_vshnpostgresqls.yaml
@@ -4965,6 +4965,10 @@ spec:
                     service:
                       description: Service contains PostgreSQL DBaaS specific properties
                       properties:
+                        DisablePgBouncer:
+                          default: false
+                          description: Disable connection pooling service PgBouncer. All connections will go straight to PostgreSQL instance.
+                          type: boolean
                         access:
                           description: Access defines additional users and databases for this instance.
                           items:

diff --git a/crds/vshn.appcat.vshn.io_xvshnkeycloaks.yaml b/crds/vshn.appcat.vshn.io_xvshnkeycloaks.yaml
@@ -11555,6 +11555,11 @@ spec:
                             description: Service contains PostgreSQL DBaaS specific
                               properties
                             properties:
+                              DisablePgBouncer:
+                                default: false
+                                description: Disable connection pooling service PgBouncer.
+                                  All connections will go straight to PostgreSQL instance.
+                                type: boolean
                               access:
                                 description: Access defines additional users and databases
                                   for this instance.

diff --git a/crds/vshn.appcat.vshn.io_xvshnnextclouds.yaml b/crds/vshn.appcat.vshn.io_xvshnnextclouds.yaml
@@ -5576,11 +5576,19 @@ spec:
                     description: Service contains nextcloud DBaaS specific properties
                     properties:
                       collabora:
+                        description: Collabora contains settings to control the Collabora
+                          integration.
                         properties:
                           enabled:
                             default: false
+                            description: Enabled enables the Collabora integration.
+                              It will autoconfigure the Collabora server URL in Your
+                              Nextcloud instance.
                             type: boolean
                           fqdn:
+                            description: FQDN contains the FQDN of the Collabora server.
+                              This is used to configure the Collabora server URL in
+                              Your Nextcloud instance.
                             type: string
                         required:
                         - enabled
@@ -11529,6 +11537,11 @@ spec:
                             description: Service contains PostgreSQL DBaaS specific
                               properties
                             properties:
+                              DisablePgBouncer:
+                                default: false
+                                description: Disable connection pooling service PgBouncer.
+                                  All connections will go straight to PostgreSQL instance.
+                                type: boolean
                               access:
                                 description: Access defines additional users and databases
                                   for this instance.

diff --git a/crds/vshn.appcat.vshn.io_xvshnpostgresqls.yaml b/crds/vshn.appcat.vshn.io_xvshnpostgresqls.yaml
@@ -5647,6 +5647,11 @@ spec:
                   service:
                     description: Service contains PostgreSQL DBaaS specific properties
                     properties:
+                      DisablePgBouncer:
+                        default: false
+                        description: Disable connection pooling service PgBouncer.
+                          All connections will go straight to PostgreSQL instance.
+                        type: boolean
                       access:
                         description: Access defines additional users and databases
                           for this instance.

diff --git a/pkg/comp-functions/functions/vshnpostgres/postgresql_deploy.go b/pkg/comp-functions/functions/vshnpostgres/postgresql_deploy.go
@@ -428,6 +428,7 @@ func createSgCluster(ctx context.Context, comp *vshnv1.VSHNPostgreSQL, svc *runt
 				Scheduling: &sgv1.SGClusterSpecPodsScheduling{
 					NodeSelector: nodeSelector,
 				},
+				DisableConnectionPooling: ptr.To(false),
 			},
 			NonProductionOptions: &sgv1.SGClusterSpecNonProductionOptions{
 				EnableSetPatroniCpuRequests:    ptr.To(true),
@@ -437,6 +438,11 @@ func createSgCluster(ctx context.Context, comp *vshnv1.VSHNPostgreSQL, svc *runt
 			},
 		},
 	}
+
+	if !comp.Spec.Parameters.Service.DisablePgBouncer {
+		sgCluster.Spec.Pods.DisableConnectionPooling = ptr.To(true)
+	}
+
 	configureReplication(comp, sgCluster)
 
 	err = svc.SetDesiredKubeObjectWithName(sgCluster, comp.GetName()+"-cluster", "cluster", runtime.KubeOptionAddRefs(backupRef))