public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bump pooler image to use new alpine base image (#1985) 

* bump pooler image to use new alpine base image
* use a safe default for PGHOST pooler env variable
This commit is contained in:
Felix Kunde 2022-08-08 17:36:43 +02:00 committed by GitHub
parent 4ee6c66620
commit 88a2931550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/postgres-operator/crds/operatorconfigurations.yaml
View File

@ -597,7 +597,7 @@ spec:
default: "pooler" default: "pooler"
connection_pooler_image: connection_pooler_image:
type: string type: string
default: "registry.opensource.zalan.do/acid/pgbouncer:master-22" default: "registry.opensource.zalan.do/acid/pgbouncer:master-24"
connection_pooler_max_db_connections: connection_pooler_max_db_connections:
type: integer type: integer
default: 60 default: 60

2
charts/postgres-operator/values.yaml
View File

@ -392,7 +392,7 @@ configConnectionPooler:
# db user for pooler to use # db user for pooler to use
connection_pooler_user: "pooler" connection_pooler_user: "pooler"
# docker image # docker image
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-22" connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-24"
# max db connections the pooler should hold # max db connections the pooler should hold
connection_pooler_max_db_connections: 60 connection_pooler_max_db_connections: 60
# default pooling mode # default pooling mode

2
manifests/configmap.yaml
View File

@ -17,7 +17,7 @@ data:
# connection_pooler_default_cpu_request: "500m" # connection_pooler_default_cpu_request: "500m"
# connection_pooler_default_memory_limit: 100Mi # connection_pooler_default_memory_limit: 100Mi
# connection_pooler_default_memory_request: 100Mi # connection_pooler_default_memory_request: 100Mi
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-22" connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-24"
# connection_pooler_max_db_connections: 60 # connection_pooler_max_db_connections: 60
# connection_pooler_mode: "transaction" # connection_pooler_mode: "transaction"
# connection_pooler_number_of_instances: 2 # connection_pooler_number_of_instances: 2

2
manifests/minimal-fake-pooler-deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
serviceAccountName: postgres-operator serviceAccountName: postgres-operator
containers: containers:
- name: postgres-operator - name: postgres-operator
image: registry.opensource.zalan.do/acid/pgbouncer:master-22 image: registry.opensource.zalan.do/acid/pgbouncer:master-24
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
requests: requests:

2
manifests/operatorconfiguration.crd.yaml
View File

@ -595,7 +595,7 @@ spec:
default: "pooler" default: "pooler"
connection_pooler_image: connection_pooler_image:
type: string type: string
default: "registry.opensource.zalan.do/acid/pgbouncer:master-22" default: "registry.opensource.zalan.do/acid/pgbouncer:master-24"
connection_pooler_max_db_connections: connection_pooler_max_db_connections:
type: integer type: integer
default: 60 default: 60

2
manifests/postgresql-operator-default-configuration.yaml
View File

@ -190,7 +190,7 @@ configuration:
connection_pooler_default_cpu_request: "500m" connection_pooler_default_cpu_request: "500m"
connection_pooler_default_memory_limit: 100Mi connection_pooler_default_memory_limit: 100Mi
connection_pooler_default_memory_request: 100Mi connection_pooler_default_memory_request: 100Mi
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-22" connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-24"
# connection_pooler_max_db_connections: 60 # connection_pooler_max_db_connections: 60
connection_pooler_mode: "transaction" connection_pooler_mode: "transaction"
connection_pooler_number_of_instances: 2 connection_pooler_number_of_instances: 2

5
pkg/cluster/k8sres.go
View File

@ -102,8 +102,9 @@ func (c *Cluster) serviceAddress(role PostgresRole) string {
return service.ObjectMeta.Name return service.ObjectMeta.Name
} }
c.logger.Warningf("No service for role %s", role) defaultAddress := c.serviceName(role)
return "" c.logger.Warningf("No service for role %s - defaulting to %s", role, defaultAddress)
return defaultAddress
} }
func (c *Cluster) servicePort(role PostgresRole) int32 { func (c *Cluster) servicePort(role PostgresRole) int32 {