From 1383829440d2d6b9750dbb49e8f2c2edbc39adcb Mon Sep 17 00:00:00 2001 From: Mitch Murphy Date: Fri, 5 Jun 2026 13:58:33 -0400 Subject: [PATCH] style(crd): gofmt connection pooler config fields --- .../v1/operator_configuration_type.go | 20 +++++++++---------- pkg/controller/operator_config.go | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go b/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go index ab4f451c4..f75e61acd 100644 --- a/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go +++ b/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go @@ -210,16 +210,16 @@ type ScalyrConfiguration struct { // ConnectionPoolerConfiguration defines default configuration for connection pooler type ConnectionPoolerConfiguration struct { - NumberOfInstances *int32 `json:"connection_pooler_number_of_instances,omitempty"` - Schema string `json:"connection_pooler_schema,omitempty"` - User string `json:"connection_pooler_user,omitempty"` - Image string `json:"connection_pooler_image,omitempty"` - Mode string `json:"connection_pooler_mode,omitempty"` - MaxDBConnections *int32 `json:"connection_pooler_max_db_connections,omitempty"` - DefaultCPURequest string `json:"connection_pooler_default_cpu_request,omitempty"` - DefaultMemoryRequest string `json:"connection_pooler_default_memory_request,omitempty"` - DefaultCPULimit string `json:"connection_pooler_default_cpu_limit,omitempty"` - DefaultMemoryLimit string `json:"connection_pooler_default_memory_limit,omitempty"` + NumberOfInstances *int32 `json:"connection_pooler_number_of_instances,omitempty"` + Schema string `json:"connection_pooler_schema,omitempty"` + User string `json:"connection_pooler_user,omitempty"` + Image string `json:"connection_pooler_image,omitempty"` + Mode string `json:"connection_pooler_mode,omitempty"` + MaxDBConnections *int32 `json:"connection_pooler_max_db_connections,omitempty"` + DefaultCPURequest string `json:"connection_pooler_default_cpu_request,omitempty"` + DefaultMemoryRequest string `json:"connection_pooler_default_memory_request,omitempty"` + DefaultCPULimit string `json:"connection_pooler_default_cpu_limit,omitempty"` + DefaultMemoryLimit string `json:"connection_pooler_default_memory_limit,omitempty"` GenerateConfig *bool `json:"connection_pooler_generate_config,omitempty"` Command []string `json:"connection_pooler_command,omitempty"` Args []string `json:"connection_pooler_args,omitempty"` diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go index 04543364f..2dfa79fe0 100644 --- a/pkg/controller/operator_config.go +++ b/pkg/controller/operator_config.go @@ -294,6 +294,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur if fromCRD.ConnectionPooler.GenerateConfig != nil { result.ConnectionPooler.GenerateConfig = *fromCRD.ConnectionPooler.GenerateConfig } + // Command is nil when not configured (keeps the image entrypoint) result.ConnectionPooler.Command = fromCRD.ConnectionPooler.Command result.ConnectionPooler.Args = util.CoalesceStrArr( fromCRD.ConnectionPooler.Args,