Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
# exclude some folders
setup/helm/configmap.yaml
setup/monitoring
setup/operator
setup/monitoring.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ kind: postgresql
metadata:
name: cluster-1
spec:
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
numberOfInstances: 1
postgresql:
version: '16'
parameters:
password_encryption: "scram-sha-256"
resources:
limits:
cpu: 500m
Expand Down
4 changes: 1 addition & 3 deletions cluster-tutorials/high-availability-cluster/ha-postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ kind: postgresql
metadata:
name: ha-cluster-1
spec:
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
numberOfInstances: 2
postgresql:
version: '16'
parameters:
password_encryption: "scram-sha-256"
resources:
limits:
cpu: 500m
Expand Down
32 changes: 3 additions & 29 deletions cluster-tutorials/monitored_cluster/postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@ apiVersion: cpo.opensource.cybertec.at/v1
kind: postgresql
metadata:
name: cluster-1
labels:
cpo_monitoring_stack: 'true'
spec:
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
numberOfInstances: 1
postgresql:
version: '16'
parameters:
shared_preload_libraries: 'pg_stat_statements,pgnodemx'
password_encryption: "scram-sha-256"
resources:
limits:
cpu: 500m
Expand All @@ -23,26 +18,5 @@ spec:
volume:
size: 5Gi
#storageClass: default-provisioner
sidecars:
- env:
- name: DATA_SOURCE_URI
value: 'localhost:5432/postgres?sslmode=disable'
- name: DATA_SOURCE_USER
valueFrom:
secretKeyRef:
key: username
name: cpo-exporter.cluster-1.credentials.postgresql.acid.zalan.do
- name: DATA_SOURCE_PASS
valueFrom:
secretKeyRef:
key: password
name: cpo-exporter.cluster-1.credentials.postgresql.acid.zalan.do
image: 'docker.io/cybertecpostgresql/cybertec-pg-container:exporter-0.6.0-1'
name: postgres-exporter
ports:
- containerPort: 9187
name: http
protocol: TCP
users:
cpo_exporter:
- login
monitor:
image: docker.io/cybertecpostgresql/cybertec-pg-container:exporter-16.2-2-rc1
7 changes: 2 additions & 5 deletions cluster-tutorials/pgbackrest_with_s3/postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ kind: postgresql
metadata:
name: cluster-1
spec:
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
numberOfInstances: 1
postgresql:
version: '16'
parameters:
password_encryption: "scram-sha-256"
resources:
limits:
cpu: 500m
Expand All @@ -27,8 +25,7 @@ spec:
repo1-path: /YOUR_PATH_INSIDE_THE_BUCKET/repo1/
repo1-retention-full: '7'
repo1-retention-full-type: count
image: >-
docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-rocky9-16-13-1
image: docker.io/cybertecpostgresql/cybertec-pg-container:pgbackrest-16.2-2-rc1
repos:
- endpoint: YOUR_S3_ENDPOINT
name: repo1
Expand Down
4 changes: 1 addition & 3 deletions cluster-tutorials/prepared_databases/postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ kind: postgresql
metadata:
name: cluster-1
spec:
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
numberOfInstances: 1
postgresql:
version: '16'
parameters:
password_encryption: "scram-sha-256"
preparedDatabases:
bar:
defaultUsers: true
Expand Down
4 changes: 1 addition & 3 deletions cluster-tutorials/single-cluster/postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ kind: postgresql
metadata:
name: cluster-1
spec:
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
numberOfInstances: 1
postgresql:
version: '16'
parameters:
password_encryption: "scram-sha-256"
resources:
limits:
cpu: 500m
Expand Down
6 changes: 6 additions & 0 deletions setup/helm/operator/crds/postgresql.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,12 @@ spec:
type: object
additionalProperties:
type: string
monitor:
nullable: true
properties:
image:
type: string
type: object
nodeAffinity:
type: object
properties:
Expand Down
2 changes: 1 addition & 1 deletion setup/helm/operator/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ Github project: https://github.com/cybertec-postgresql/postgres-pg-opera
Documentation: https://cybertec-postgresql.github.io/CYBERTEC-pg-operator/

Apache License Version 2.0
Copyright 2022-2023 CYBERTEC PostgreSQL International GmbH
Copyright 2022-2024 CYBERTEC PostgreSQL International GmbH
9 changes: 0 additions & 9 deletions setup/helm/operator/templates/infrastructure_role.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ configuration:
# major_version_upgrade_team_allow_list:
# - acid
minimal_major_version: "13"
target_major_version: "15"
target_major_version: "16"
kubernetes:
# additional_pod_capabilities:
# - "SYS_NICE"
cluster_domain: cluster.local
cluster_labels:
application: spilo
application: cpo
cluster_name_label: cluster-name
inherited_labels:
- cpo_monitoring_stack
Expand All @@ -71,11 +71,11 @@ configuration:
enable_sidecars: true
# ignored_annotations:
# - k8s.v1.cni.cncf.io/network-status
infrastructure_roles_secrets:
- secretname: "cpo-monitoring-role"
userkey: "user"
passwordkey: "password"
rolekey: "inrole"
# infrastructure_roles_secrets:
# - secretname: "cpo-monitoring-role"
# userkey: "user"
# passwordkey: "password"
# rolekey: "inrole"
# - secretname: "other-infrastructure-role"
# userkey: "other-user-key"
# passwordkey: "other-password-key"
Expand Down
2 changes: 1 addition & 1 deletion setup/helm/operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ imagePullSecretNames: []

# Define the operator settings to add to the configmap
operatorSettings:
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:0.7.0-rc5'
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.7.0-2-rc1'
watched_namespace: '*'
enable_pod_antiaffinity: 'true'
operator_namespace: 'cpo'
Expand Down