Skip to content

Commit ffe9a6e

Browse files
author
matthias
committed
changes for v0.7.0-rc1
1 parent 0713e95 commit ffe9a6e

File tree

13 files changed

+49
-43
lines changed

13 files changed

+49
-43
lines changed
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
apiVersion: acid.zalan.do/v1
1+
apiVersion: cpo.opensource.cybertec.at/v1
22
kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-5'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
77
numberOfInstances: 1
88
postgresql:
9-
version: '15'
9+
version: '16'
1010
resources:
1111
limits:
1212
cpu: 500m
@@ -17,7 +17,8 @@ spec:
1717
teamId: acid
1818
volume:
1919
size: 5Gi
20-
users:
21-
applikationsuser:
22-
- login
23-
#storageClass: default-provisioner
20+
users:
21+
matrix:
22+
- login
23+
databases:
24+
matrixdb: matrix

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
apiVersion: acid.zalan.do/v1
1+
apiVersion: cpo.opensource.cybertec.at/v1
22
kind: postgresql
33
metadata:
4-
name: acid-ha-cluster-1
4+
name: ha-cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-os-container:postgres-rocky-14.6-1-dev'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
77
numberOfInstances: 2
88
postgresql:
9-
version: '14'
9+
version: '16'
1010
resources:
1111
limits:
1212
cpu: 500m

cluster-tutorials/monitored_cluster/postgres.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
apiVersion: acid.zalan.do/v1
1+
apiVersion: cpo.opensource.cybertec.at/v1
22
kind: postgresql
33
metadata:
44
name: cluster-1
55
labels:
66
cpo_monitoring_stack: 'true'
77
spec:
8-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-5'
8+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
99
numberOfInstances: 1
1010
postgresql:
11-
version: '15'
11+
version: '16'
1212
parameters:
1313
shared_preload_libraries: 'pg_stat_statements,pgnodemx'
1414
resources:

cluster-tutorials/pgbackrest_with_s3/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
secretGenerator:
2-
- name: acid-cluster-1-s3-credentials
2+
- name: cluster-1-s3-credentials
33
files:
44
- s3.configuration
55

cluster-tutorials/pgbackrest_with_s3/postgres.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
apiVersion: acid.zalan.do/v1
1+
apiVersion: cpo.opensource.cybertec.at/v1
22
kind: postgresql
33
metadata:
4-
name: acid-cluster-1
4+
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-os-container:postgres-rocky-14.6-1-dev'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
77
numberOfInstances: 1
88
postgresql:
9-
version: '14'
10-
postgresVersion: 14
9+
version: '16'
1110
resources:
1211
limits:
1312
cpu: 500m
@@ -21,13 +20,13 @@ spec:
2120
backup:
2221
pgbackrest:
2322
configuration:
24-
secret: acid-cluster-1-s3-credentials
23+
secret: cluster-1-s3-credentials
2524
global:
2625
repo1-path: /YOUR_PATH_INSIDE_THE_BUCKET/repo1/
2726
repo1-retention-full: '7'
2827
repo1-retention-full-type: count
2928
image: >-
30-
docker.io/cybertecpostgresql/cybertec-os-container:pgbackrest-rocky-14.6-4-dev
29+
docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-rocky9-16-13-1
3130
repos:
3231
- endpoint: YOUR_S3_ENDPOINT
3332
name: repo1

cluster-tutorials/prepared_databases/postgres.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
apiVersion: acid.zalan.do/v1
1+
apiVersion: cpo.opensource.cybertec.at/v1
22
kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-5'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
77
numberOfInstances: 1
88
postgresql:
9-
version: '15'
9+
version: '16'
1010
preparedDatabases:
1111
bar:
1212
defaultUsers: true

cluster-tutorials/single-cluster/postgres.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
apiVersion: acid.zalan.do/v1
1+
apiVersion: cpo.opensource.cybertec.at/v1
22
kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-5'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
77
numberOfInstances: 1
88
postgresql:
9-
version: '15'
9+
version: '16'
1010
resources:
1111
limits:
1212
cpu: 500m

setup/helm/operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ type: application
33
name: postgres-operator
44
description: Helm-Chart for setting up an instance of CYBERTEC's Postgres operator (CPO).
55

6-
appVersion: 0.5.0
7-
version: 0.5.0
6+
appVersion: 0.7.0
7+
version: 0.7.0-rc1
88
# Note: Make sure you have defined the correct version, based on the crd used

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
4-
name: operatorconfigurations.acid.zalan.do
4+
name: operatorconfigurations.cpo.opensource.cybertec.at
55
spec:
6-
group: acid.zalan.do
6+
group: cpo.opensource.cybertec.at
77
names:
88
kind: OperatorConfiguration
99
listKind: OperatorConfigurationList
@@ -55,7 +55,7 @@ spec:
5555
apiVersion:
5656
type: string
5757
enum:
58-
- acid.zalan.do/v1
58+
- cpo.opensource.cybertec.at/v1
5959
configuration:
6060
type: object
6161
properties:

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
4-
name: postgresqls.acid.zalan.do
4+
name: postgresqls.cpo.opensource.cybertec.at
55
spec:
6-
group: acid.zalan.do
6+
group: cpo.opensource.cybertec.at
77
names:
88
kind: postgresql
99
listKind: postgresqlList
@@ -67,7 +67,7 @@ spec:
6767
apiVersion:
6868
type: string
6969
enum:
70-
- acid.zalan.do/v1
70+
- cpo.opensource.cybertec.at/v1
7171
spec:
7272
type: object
7373
required:
@@ -547,7 +547,7 @@ spec:
547547
memory:
548548
type: string
549549
# You can express memory as a plain integer or as a fixed-point
550-
# integer using one of these suffixes: E, P, T, G, M, k. You can
550+
# integer using one of these
551551
# also use the power-of-two equivalents: Ei, Pi, Ti, Gi, Mi, Ki
552552
#
553553
# https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory
@@ -631,6 +631,12 @@ spec:
631631
type: string
632632
payloadColumn:
633633
type: string
634+
tde:
635+
nullable: true
636+
properties:
637+
enable:
638+
type: boolean
639+
type: object
634640
teamId:
635641
type: string
636642
tls:
@@ -854,10 +860,10 @@ spec:
854860
memory:
855861
type: string
856862
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
857-
required:
863+
required:
858864
- image
859865
- repos
860866
status:
861867
type: object
862868
additionalProperties:
863-
type: string
869+
type: string

0 commit comments

Comments
 (0)