Skip to content

Commit ab0fd82

Browse files
SchmaetzSchmaetz
authored
Merge pull request #20 from cybertec-postgresql/v0.7.0-rc2-fix
v0.7.0
2 parents 20664f2 + 4d06ce0 commit ab0fd82

File tree

13 files changed

+41
-17
lines changed

13 files changed

+41
-17
lines changed

Diff for: ‎cluster-tutorials/configure_users_and_databases/postgres.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'

Diff for: ‎cluster-tutorials/high-availability-cluster/ha-postgres.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: ha-cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
77
numberOfInstances: 2
88
postgresql:
99
version: '16'

Diff for: ‎cluster-tutorials/loadbalancer-cluster/lb-postgres.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: ha-cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'
@@ -15,7 +15,7 @@ spec:
1515
cpu: 500m
1616
memory: 500Mi
1717
connectionPooler:
18-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.22-rc3'
18+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.22-1'
1919
mode: transaction
2020
numberOfInstances: 2
2121
resources:
@@ -27,6 +27,8 @@ spec:
2727
memory: 100Mi
2828
schema: pooler
2929
user: pooler
30+
enableConnectionPooler: true
31+
enableReplicaConnectionPooler: true
3032
teamId: acid
3133
volume:
3234
size: 5Gi

Diff for: ‎cluster-tutorials/monitored_cluster/postgres.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'
@@ -19,4 +19,4 @@ spec:
1919
size: 5Gi
2020
#storageClass: default-provisioner
2121
monitor:
22-
image: docker.io/cybertecpostgresql/cybertec-pg-container:exporter-16.3-1-rc2'
22+
image: docker.io/cybertecpostgresql/cybertec-pg-container:exporter-16.3-1'

Diff for: ‎cluster-tutorials/pgbackrest_with_pvc/postgres.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'
@@ -24,7 +24,7 @@ spec:
2424
global:
2525
repo1-retention-full: '7'
2626
repo1-retention-full-type: count
27-
image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.3-1-rc2
27+
image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.3-1
2828
repos:
2929
- name: repo1
3030
schedule:

Diff for: ‎cluster-tutorials/pgbackrest_with_s3/postgres.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'
@@ -25,7 +25,7 @@ spec:
2525
repo1-path: /YOUR_PATH_INSIDE_THE_BUCKET/repo1/
2626
repo1-retention-full: '7'
2727
repo1-retention-full-type: count
28-
image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.3-1-rc2
28+
image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.3-1
2929
repos:
3030
- endpoint: YOUR_S3_ENDPOINT
3131
name: repo1

Diff for: ‎cluster-tutorials/prepared_databases/postgres.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'

Diff for: ‎cluster-tutorials/public-beta-pg17/postgres.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apiVersion: cpo.opensource.cybertec.at/v1
2+
kind: postgresql
3+
metadata:
4+
name: publicbeta-cluster-1
5+
spec:
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17beta2-1'
7+
numberOfInstances: 1
8+
postgresql:
9+
version: '17'
10+
resources:
11+
limits:
12+
cpu: 500m
13+
memory: 500Mi
14+
requests:
15+
cpu: 500m
16+
memory: 500Mi
17+
teamId: acid
18+
volume:
19+
size: 5Gi
20+
#storageClass: default-provisioner

Diff for: ‎cluster-tutorials/restore/postgres.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'
@@ -24,7 +24,7 @@ spec:
2424
global:
2525
repo1-retention-full: '7'
2626
repo1-retention-full-type: count
27-
image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.3-1-rc2
27+
image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.3-1
2828
repos:
2929
- name: repo1
3030
schedule:

Diff for: ‎cluster-tutorials/single-cluster/postgres.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'

Diff for: ‎setup/helm/operator/crds/postgresql.crd.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,7 @@ spec:
505505
- "14"
506506
- "15"
507507
- "16"
508+
- "17"
508509
type: string
509510
required:
510511
- version

Diff for: ‎setup/helm/operator/templates/postgresql-operator-configuration.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ configuration:
198198
connection_pooler_default_cpu_request: "500m"
199199
connection_pooler_default_memory_limit: 100Mi
200200
connection_pooler_default_memory_request: 100Mi
201-
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-24"
201+
connection_pooler_image: {{ .Values.operatorSettings.poolerImage }}
202202
# connection_pooler_max_db_connections: 60
203203
connection_pooler_mode: "transaction"
204204
connection_pooler_number_of_instances: 2

Diff for: ‎setup/helm/operator/values.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ imagePullSecretNames: []
1515

1616
# Define the operator settings to add to the configmap
1717
operatorSettings:
18-
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.7.0-1-rc2'
19-
postgresImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1-rc2'
18+
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.7.0-1'
19+
postgresImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.3-1'
20+
poolerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:pgbouncer-1.22-1'
2021
watched_namespace: '*'
2122
enable_pod_antiaffinity: 'true'
2223
operator_namespace: 'cpo'

0 commit comments

Comments
 (0)