From 716eaae770c31aaaec7aeaf01b3b0eaf50c518fd Mon Sep 17 00:00:00 2001 From: matthias Date: Tue, 12 Mar 2024 08:13:26 +0100 Subject: [PATCH 1/4] updated to rc1 --- .../postgres.yaml | 4 +-- .../ha-postgres.yaml | 4 +-- .../monitored_cluster/postgres.yaml | 32 ++----------------- .../pgbackrest_with_s3/postgres.yaml | 4 +-- .../prepared_databases/postgres.yaml | 4 +-- .../single-cluster/postgres.yaml | 4 +-- setup/helm/operator/crds/postgresql.crd.yaml | 6 ++++ setup/helm/operator/values.yaml | 2 +- 8 files changed, 15 insertions(+), 45 deletions(-) diff --git a/cluster-tutorials/configure_users_and_databases/postgres.yaml b/cluster-tutorials/configure_users_and_databases/postgres.yaml index 7abd1cd..92e8beb 100644 --- a/cluster-tutorials/configure_users_and_databases/postgres.yaml +++ b/cluster-tutorials/configure_users_and_databases/postgres.yaml @@ -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-dev' numberOfInstances: 1 postgresql: version: '16' - parameters: - password_encryption: "scram-sha-256" resources: limits: cpu: 500m diff --git a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml index fde76ca..2aef45e 100644 --- a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml +++ b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml @@ -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-dev' numberOfInstances: 2 postgresql: version: '16' - parameters: - password_encryption: "scram-sha-256" resources: limits: cpu: 500m diff --git a/cluster-tutorials/monitored_cluster/postgres.yaml b/cluster-tutorials/monitored_cluster/postgres.yaml index 7030ace..adb69f8 100644 --- a/cluster-tutorials/monitored_cluster/postgres.yaml +++ b/cluster-tutorials/monitored_cluster/postgres.yaml @@ -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-dev' numberOfInstances: 1 postgresql: version: '16' - parameters: - shared_preload_libraries: 'pg_stat_statements,pgnodemx' - password_encryption: "scram-sha-256" resources: limits: cpu: 500m @@ -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-1-rc1 diff --git a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml index fd6705f..b73fb1d 100644 --- a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml +++ b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml @@ -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-dev' numberOfInstances: 1 postgresql: version: '16' - parameters: - password_encryption: "scram-sha-256" resources: limits: cpu: 500m diff --git a/cluster-tutorials/prepared_databases/postgres.yaml b/cluster-tutorials/prepared_databases/postgres.yaml index 1d678e0..5b27538 100644 --- a/cluster-tutorials/prepared_databases/postgres.yaml +++ b/cluster-tutorials/prepared_databases/postgres.yaml @@ -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-dev' numberOfInstances: 1 postgresql: version: '16' - parameters: - password_encryption: "scram-sha-256" preparedDatabases: bar: defaultUsers: true diff --git a/cluster-tutorials/single-cluster/postgres.yaml b/cluster-tutorials/single-cluster/postgres.yaml index 1714974..604a49a 100644 --- a/cluster-tutorials/single-cluster/postgres.yaml +++ b/cluster-tutorials/single-cluster/postgres.yaml @@ -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-dev' numberOfInstances: 1 postgresql: version: '16' - parameters: - password_encryption: "scram-sha-256" resources: limits: cpu: 500m diff --git a/setup/helm/operator/crds/postgresql.crd.yaml b/setup/helm/operator/crds/postgresql.crd.yaml index 385eea7..eb86c6b 100644 --- a/setup/helm/operator/crds/postgresql.crd.yaml +++ b/setup/helm/operator/crds/postgresql.crd.yaml @@ -340,6 +340,12 @@ spec: type: object additionalProperties: type: string + monitor: + nullable: true + properties: + image: + type: string + type: object nodeAffinity: type: object properties: diff --git a/setup/helm/operator/values.yaml b/setup/helm/operator/values.yaml index 7ea8f65..56ee17b 100644 --- a/setup/helm/operator/values.yaml +++ b/setup/helm/operator/values.yaml @@ -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-rc1-x86_64' watched_namespace: '*' enable_pod_antiaffinity: 'true' operator_namespace: 'cpo' From 36257a25818e0394e26fac653ba0d40c0a24fb98 Mon Sep 17 00:00:00 2001 From: matthias Date: Wed, 13 Mar 2024 17:50:34 +0100 Subject: [PATCH 2/4] updated --- setup/helm/operator/templates/NOTES.txt | 2 +- .../postgresql-operator-configuration.yaml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/setup/helm/operator/templates/NOTES.txt b/setup/helm/operator/templates/NOTES.txt index 2ffd4da..9725888 100644 --- a/setup/helm/operator/templates/NOTES.txt +++ b/setup/helm/operator/templates/NOTES.txt @@ -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 diff --git a/setup/helm/operator/templates/postgresql-operator-configuration.yaml b/setup/helm/operator/templates/postgresql-operator-configuration.yaml index bb0ee12..caa2a02 100644 --- a/setup/helm/operator/templates/postgresql-operator-configuration.yaml +++ b/setup/helm/operator/templates/postgresql-operator-configuration.yaml @@ -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 @@ -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" From c627389e300c1a67def7e7ee2c616d42912a1264 Mon Sep 17 00:00:00 2001 From: matthias Date: Thu, 14 Mar 2024 11:12:04 +0100 Subject: [PATCH 3/4] changed image to rc1 --- cluster-tutorials/configure_users_and_databases/postgres.yaml | 2 +- cluster-tutorials/high-availability-cluster/ha-postgres.yaml | 2 +- cluster-tutorials/monitored_cluster/postgres.yaml | 2 +- cluster-tutorials/pgbackrest_with_s3/postgres.yaml | 2 +- cluster-tutorials/prepared_databases/postgres.yaml | 2 +- cluster-tutorials/single-cluster/postgres.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cluster-tutorials/configure_users_and_databases/postgres.yaml b/cluster-tutorials/configure_users_and_databases/postgres.yaml index 92e8beb..42778b6 100644 --- a/cluster-tutorials/configure_users_and_databases/postgres.yaml +++ b/cluster-tutorials/configure_users_and_databases/postgres.yaml @@ -3,7 +3,7 @@ kind: postgresql metadata: name: cluster-1 spec: - dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-dev' + dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1' numberOfInstances: 1 postgresql: version: '16' diff --git a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml index 2aef45e..3f09934 100644 --- a/cluster-tutorials/high-availability-cluster/ha-postgres.yaml +++ b/cluster-tutorials/high-availability-cluster/ha-postgres.yaml @@ -3,7 +3,7 @@ kind: postgresql metadata: name: ha-cluster-1 spec: - dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-dev' + dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1' numberOfInstances: 2 postgresql: version: '16' diff --git a/cluster-tutorials/monitored_cluster/postgres.yaml b/cluster-tutorials/monitored_cluster/postgres.yaml index adb69f8..90b6807 100644 --- a/cluster-tutorials/monitored_cluster/postgres.yaml +++ b/cluster-tutorials/monitored_cluster/postgres.yaml @@ -3,7 +3,7 @@ kind: postgresql metadata: name: cluster-1 spec: - dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-dev' + dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1' numberOfInstances: 1 postgresql: version: '16' diff --git a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml index b73fb1d..9e9c6fe 100644 --- a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml +++ b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml @@ -3,7 +3,7 @@ kind: postgresql metadata: name: cluster-1 spec: - dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-dev' + dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1' numberOfInstances: 1 postgresql: version: '16' diff --git a/cluster-tutorials/prepared_databases/postgres.yaml b/cluster-tutorials/prepared_databases/postgres.yaml index 5b27538..56dc9e9 100644 --- a/cluster-tutorials/prepared_databases/postgres.yaml +++ b/cluster-tutorials/prepared_databases/postgres.yaml @@ -3,7 +3,7 @@ kind: postgresql metadata: name: cluster-1 spec: - dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-dev' + dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1' numberOfInstances: 1 postgresql: version: '16' diff --git a/cluster-tutorials/single-cluster/postgres.yaml b/cluster-tutorials/single-cluster/postgres.yaml index 604a49a..7315789 100644 --- a/cluster-tutorials/single-cluster/postgres.yaml +++ b/cluster-tutorials/single-cluster/postgres.yaml @@ -3,7 +3,7 @@ kind: postgresql metadata: name: cluster-1 spec: - dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-dev' + dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1' numberOfInstances: 1 postgresql: version: '16' From 82c02aa275de48089d1e7201e3a9b0cb2ab943f5 Mon Sep 17 00:00:00 2001 From: matthias Date: Tue, 2 Apr 2024 08:04:23 +0200 Subject: [PATCH 4/4] updated to current images --- .gitignore | 3 --- cluster-tutorials/monitored_cluster/postgres.yaml | 2 +- cluster-tutorials/pgbackrest_with_s3/postgres.yaml | 3 +-- setup/helm/operator/templates/infrastructure_role.yaml | 9 --------- setup/helm/operator/values.yaml | 2 +- 5 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 setup/helm/operator/templates/infrastructure_role.yaml diff --git a/.gitignore b/.gitignore index af3191c..ec30f66 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ # exclude some folders -setup/helm/configmap.yaml setup/monitoring -setup/operator -setup/monitoring.tar.gz \ No newline at end of file diff --git a/cluster-tutorials/monitored_cluster/postgres.yaml b/cluster-tutorials/monitored_cluster/postgres.yaml index 90b6807..5b870ca 100644 --- a/cluster-tutorials/monitored_cluster/postgres.yaml +++ b/cluster-tutorials/monitored_cluster/postgres.yaml @@ -19,4 +19,4 @@ spec: size: 5Gi #storageClass: default-provisioner monitor: - image: docker.io/cybertecpostgresql/cybertec-pg-container:exporter-16.2-1-rc1 + image: docker.io/cybertecpostgresql/cybertec-pg-container:exporter-16.2-2-rc1 diff --git a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml index 9e9c6fe..d59c3c9 100644 --- a/cluster-tutorials/pgbackrest_with_s3/postgres.yaml +++ b/cluster-tutorials/pgbackrest_with_s3/postgres.yaml @@ -25,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 diff --git a/setup/helm/operator/templates/infrastructure_role.yaml b/setup/helm/operator/templates/infrastructure_role.yaml deleted file mode 100644 index fafd2b1..0000000 --- a/setup/helm/operator/templates/infrastructure_role.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: cpo-monitoring-role - namespace: {{ .Values.operatorSettings.operator_namespace }} -type: Opaque -stringData: - user: postgres_exporter - password: password diff --git a/setup/helm/operator/values.yaml b/setup/helm/operator/values.yaml index 56ee17b..ecee6d3 100644 --- a/setup/helm/operator/values.yaml +++ b/setup/helm/operator/values.yaml @@ -15,7 +15,7 @@ imagePullSecretNames: [] # Define the operator settings to add to the configmap operatorSettings: - operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.7.0-rc1-x86_64' + operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.7.0-2-rc1' watched_namespace: '*' enable_pod_antiaffinity: 'true' operator_namespace: 'cpo'