From b2b609ed1731c9c238da31aa50e05dc86018b756 Mon Sep 17 00:00:00 2001 From: matthias Date: Tue, 8 Aug 2023 10:41:35 +0200 Subject: [PATCH 1/2] added label to config & monitored_example --- cluster-tutorials/monitored_cluster/postgres.yaml | 3 +++ cluster-tutorials/single-cluster/postgres.yaml | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cluster-tutorials/monitored_cluster/postgres.yaml b/cluster-tutorials/monitored_cluster/postgres.yaml index a537e0a..1dc3410 100644 --- a/cluster-tutorials/monitored_cluster/postgres.yaml +++ b/cluster-tutorials/monitored_cluster/postgres.yaml @@ -2,6 +2,8 @@ apiVersion: acid.zalan.do/v1 kind: postgresql metadata: name: cluster-1 + labels: + cpo_monitoring_stack: 'true' spec: dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-5' numberOfInstances: 1 @@ -19,6 +21,7 @@ spec: teamId: acid volume: size: 5Gi + #storageClass: default-provisioner sidecars: - env: - name: DATA_SOURCE_URI diff --git a/cluster-tutorials/single-cluster/postgres.yaml b/cluster-tutorials/single-cluster/postgres.yaml index 99cfac5..e1c2c23 100644 --- a/cluster-tutorials/single-cluster/postgres.yaml +++ b/cluster-tutorials/single-cluster/postgres.yaml @@ -2,8 +2,6 @@ apiVersion: acid.zalan.do/v1 kind: postgresql metadata: name: cluster-1 - labels: - cpo_monitoring_stack: 'true' spec: dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-5' numberOfInstances: 1 @@ -19,3 +17,4 @@ spec: teamId: acid volume: size: 5Gi + #storageClass: default-provisioner From 0713e951cb3b22595ad24ba3a855e174ca013b99 Mon Sep 17 00:00:00 2001 From: matthias Date: Fri, 11 Aug 2023 08:32:00 +0200 Subject: [PATCH 2/2] new tutorials --- .../postgres.yaml | 23 ++++++++++++++ .../monitored_cluster/postgres.yaml | 2 +- .../prepared_databases/postgres.yaml | 31 +++++++++++++++++++ .../single-cluster/postgres.yaml | 6 ++-- 4 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 cluster-tutorials/configure_users_and_databases/postgres.yaml create mode 100644 cluster-tutorials/prepared_databases/postgres.yaml diff --git a/cluster-tutorials/configure_users_and_databases/postgres.yaml b/cluster-tutorials/configure_users_and_databases/postgres.yaml new file mode 100644 index 0000000..b32d349 --- /dev/null +++ b/cluster-tutorials/configure_users_and_databases/postgres.yaml @@ -0,0 +1,23 @@ +apiVersion: acid.zalan.do/v1 +kind: postgresql +metadata: + name: cluster-1 +spec: + dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-5' + numberOfInstances: 1 + postgresql: + version: '15' + resources: + limits: + cpu: 500m + memory: 500Mi + requests: + cpu: 500m + memory: 500Mi + teamId: acid + volume: + size: 5Gi + users: + applikationsuser: + - login + #storageClass: default-provisioner diff --git a/cluster-tutorials/monitored_cluster/postgres.yaml b/cluster-tutorials/monitored_cluster/postgres.yaml index 1dc3410..81a694b 100644 --- a/cluster-tutorials/monitored_cluster/postgres.yaml +++ b/cluster-tutorials/monitored_cluster/postgres.yaml @@ -8,7 +8,7 @@ spec: dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-5' numberOfInstances: 1 postgresql: - version: '14' + version: '15' parameters: shared_preload_libraries: 'pg_stat_statements,pgnodemx' resources: diff --git a/cluster-tutorials/prepared_databases/postgres.yaml b/cluster-tutorials/prepared_databases/postgres.yaml new file mode 100644 index 0000000..e179af9 --- /dev/null +++ b/cluster-tutorials/prepared_databases/postgres.yaml @@ -0,0 +1,31 @@ +apiVersion: acid.zalan.do/v1 +kind: postgresql +metadata: + name: cluster-1 +spec: + dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-5' + numberOfInstances: 1 + postgresql: + version: '15' + preparedDatabases: + bar: + defaultUsers: true + extensions: + pg_partman: public + pgcrypto: public + schemas: + data: {} + history: + defaultRoles: true + defaultUsers: false + resources: + limits: + cpu: 500m + memory: 500Mi + requests: + cpu: 500m + memory: 500Mi + teamId: acid + volume: + size: 5Gi + #storageClass: default-provisioner diff --git a/cluster-tutorials/single-cluster/postgres.yaml b/cluster-tutorials/single-cluster/postgres.yaml index e1c2c23..f9d4541 100644 --- a/cluster-tutorials/single-cluster/postgres.yaml +++ b/cluster-tutorials/single-cluster/postgres.yaml @@ -6,14 +6,14 @@ spec: dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-5' numberOfInstances: 1 postgresql: - version: '14' + version: '15' resources: limits: cpu: 500m memory: 500Mi requests: - cpu: 100m - memory: 100Mi + cpu: 500m + memory: 500Mi teamId: acid volume: size: 5Gi