Skip to content

Commit 716eaae

Browse files
committed
updated to rc1
1 parent a9e2fdb commit 716eaae

File tree

8 files changed

+15
-45
lines changed

8 files changed

+15
-45
lines changed

cluster-tutorials/configure_users_and_databases/postgres.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-dev'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'
10-
parameters:
11-
password_encryption: "scram-sha-256"
1210
resources:
1311
limits:
1412
cpu: 500m

cluster-tutorials/high-availability-cluster/ha-postgres.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ kind: postgresql
33
metadata:
44
name: ha-cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-dev'
77
numberOfInstances: 2
88
postgresql:
99
version: '16'
10-
parameters:
11-
password_encryption: "scram-sha-256"
1210
resources:
1311
limits:
1412
cpu: 500m

cluster-tutorials/monitored_cluster/postgres.yaml

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@ apiVersion: cpo.opensource.cybertec.at/v1
22
kind: postgresql
33
metadata:
44
name: cluster-1
5-
labels:
6-
cpo_monitoring_stack: 'true'
75
spec:
8-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-dev'
97
numberOfInstances: 1
108
postgresql:
119
version: '16'
12-
parameters:
13-
shared_preload_libraries: 'pg_stat_statements,pgnodemx'
14-
password_encryption: "scram-sha-256"
1510
resources:
1611
limits:
1712
cpu: 500m
@@ -23,26 +18,5 @@ spec:
2318
volume:
2419
size: 5Gi
2520
#storageClass: default-provisioner
26-
sidecars:
27-
- env:
28-
- name: DATA_SOURCE_URI
29-
value: 'localhost:5432/postgres?sslmode=disable'
30-
- name: DATA_SOURCE_USER
31-
valueFrom:
32-
secretKeyRef:
33-
key: username
34-
name: cpo-exporter.cluster-1.credentials.postgresql.acid.zalan.do
35-
- name: DATA_SOURCE_PASS
36-
valueFrom:
37-
secretKeyRef:
38-
key: password
39-
name: cpo-exporter.cluster-1.credentials.postgresql.acid.zalan.do
40-
image: 'docker.io/cybertecpostgresql/cybertec-pg-container:exporter-0.6.0-1'
41-
name: postgres-exporter
42-
ports:
43-
- containerPort: 9187
44-
name: http
45-
protocol: TCP
46-
users:
47-
cpo_exporter:
48-
- login
21+
monitor:
22+
image: docker.io/cybertecpostgresql/cybertec-pg-container:exporter-16.2-1-rc1

cluster-tutorials/pgbackrest_with_s3/postgres.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-dev'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'
10-
parameters:
11-
password_encryption: "scram-sha-256"
1210
resources:
1311
limits:
1412
cpu: 500m

cluster-tutorials/prepared_databases/postgres.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-dev'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'
10-
parameters:
11-
password_encryption: "scram-sha-256"
1210
preparedDatabases:
1311
bar:
1412
defaultUsers: true

cluster-tutorials/single-cluster/postgres.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-dev'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'
10-
parameters:
11-
password_encryption: "scram-sha-256"
1210
resources:
1311
limits:
1412
cpu: 500m

setup/helm/operator/crds/postgresql.crd.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,12 @@ spec:
340340
type: object
341341
additionalProperties:
342342
type: string
343+
monitor:
344+
nullable: true
345+
properties:
346+
image:
347+
type: string
348+
type: object
343349
nodeAffinity:
344350
type: object
345351
properties:

setup/helm/operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ imagePullSecretNames: []
1515

1616
# Define the operator settings to add to the configmap
1717
operatorSettings:
18-
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:0.7.0-rc5'
18+
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.7.0-rc1-x86_64'
1919
watched_namespace: '*'
2020
enable_pod_antiaffinity: 'true'
2121
operator_namespace: 'cpo'

0 commit comments

Comments
 (0)