From d5eb3b8c6df7afd2ba60637dc728c5cb3fdc356d Mon Sep 17 00:00:00 2001 From: teutonet-bot <118830326+teutonet-bot@users.noreply.github.com> Date: Wed, 10 Sep 2025 11:10:00 +0200 Subject: [PATCH 1/3] chore(main): [bot] release teuto-cnpg:3.0.0 --- .github/release-please/manifest.json | 2 +- charts/teuto-cnpg/CHANGELOG.md | 16 ++++++++++++++++ charts/teuto-cnpg/Chart.yaml | 6 +++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json index 6dc09dbaa3..dff620dd90 100644 --- a/.github/release-please/manifest.json +++ b/.github/release-please/manifest.json @@ -1 +1 @@ -{"charts/base-cluster":"9.3.2","charts/teuto-portal-k8s-worker":"3.3.0","charts/t8s-cluster":"9.3.1","charts/stellio-context-broker":"0.1.0","charts/chirpstack":"0.1.0","charts/common":"1.5.0","charts/ckan":"1.3.3","charts/teuto-cnpg":"2.1.0"} +{"charts/base-cluster":"9.3.2","charts/teuto-portal-k8s-worker":"3.3.0","charts/t8s-cluster":"9.3.1","charts/stellio-context-broker":"0.1.0","charts/chirpstack":"0.1.0","charts/common":"1.5.0","charts/ckan":"1.3.3","charts/teuto-cnpg":"3.0.0"} diff --git a/charts/teuto-cnpg/CHANGELOG.md b/charts/teuto-cnpg/CHANGELOG.md index 608f6e417a..9cc8ef0c24 100644 --- a/charts/teuto-cnpg/CHANGELOG.md +++ b/charts/teuto-cnpg/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [3.0.0](https://github.com/teutonet/teutonet-helm-charts/compare/teuto-cnpg-v2.1.0...teuto-cnpg-v3.0.0) (2025-09-10) + + +### ⚠ BREAKING CHANGES + +* **teuto-cnpg:** remodel to make use of the new way of creating barman backups ([#1663](https://github.com/teutonet/teutonet-helm-charts/issues/1663)) + +### Features + +* **teuto-cnpg:** remodel to make use of the new way of creating barman backups ([#1663](https://github.com/teutonet/teutonet-helm-charts/issues/1663)) ([6c56e63](https://github.com/teutonet/teutonet-helm-charts/commit/6c56e635f67002250423794730b7f0495d6df5ff)) + + +### Bug Fixes + +* **teuto-cnpg/updateMethod:** set update method to switchover, set env-vars to make it compatible with newer barman ([#1572](https://github.com/teutonet/teutonet-helm-charts/issues/1572)) ([3082967](https://github.com/teutonet/teutonet-helm-charts/commit/30829679527a6c291fc30af1bcd0f9c91cee2657)) + ## [2.1.0](https://github.com/teutonet/teutonet-helm-charts/compare/teuto-cnpg-v2.0.0...teuto-cnpg-v2.1.0) (2025-07-29) diff --git a/charts/teuto-cnpg/Chart.yaml b/charts/teuto-cnpg/Chart.yaml index 1b2a137d38..a1429c77b0 100644 --- a/charts/teuto-cnpg/Chart.yaml +++ b/charts/teuto-cnpg/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: teuto-cnpg -description: A Helm chart to abstract the managing of cnpg-databases from the original - resource. +description: A Helm chart to abstract the managing of cnpg-databases from the + original resource. maintainers: - email: cwr@teuto.net name: cwrau @@ -10,7 +10,7 @@ maintainers: - email: st@teuto.net name: tasches type: application -version: 2.1.0 +version: 3.0.0 dependencies: - name: common repository: oci://ghcr.io/teutonet/teutonet-helm-charts From b86e82b86ed1d39d14fdaacf6d9f8e96f9d900a5 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Sep 2025 09:11:41 +0000 Subject: [PATCH 2/3] ci: [bot] Update sources in 'Chart.yaml' --- charts/teuto-cnpg/Chart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/teuto-cnpg/Chart.yaml b/charts/teuto-cnpg/Chart.yaml index a1429c77b0..e7cb57daec 100644 --- a/charts/teuto-cnpg/Chart.yaml +++ b/charts/teuto-cnpg/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: teuto-cnpg -description: A Helm chart to abstract the managing of cnpg-databases from the - original resource. +description: A Helm chart to abstract the managing of cnpg-databases from the original + resource. maintainers: - email: cwr@teuto.net name: cwrau @@ -16,7 +16,7 @@ dependencies: repository: oci://ghcr.io/teutonet/teutonet-helm-charts version: 1.2.1 sources: - - https://github.com/teutonet/teutonet-helm-charts/tree/teuto-cnpg-v2.1.0/charts/teuto-cnpg + - https://github.com/teutonet/teutonet-helm-charts/tree/teuto-cnpg-v3.0.0/charts/teuto-cnpg - https://github.com/teutonet/teutonet-helm-charts/tree/main/charts/teuto-cnpg annotations: artifacthub.io/images: |- From 4d2116053282e971ebc4635de7cd062547ddae04 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 10 Sep 2025 09:11:51 +0000 Subject: [PATCH 3/3] ci: [bot] Update 'README.md' --- charts/teuto-cnpg/README.md | 104 +++++++++++++++++++++++++++++++++--- 1 file changed, 96 insertions(+), 8 deletions(-) diff --git a/charts/teuto-cnpg/README.md b/charts/teuto-cnpg/README.md index a61c8b1909..df6200b831 100644 --- a/charts/teuto-cnpg/README.md +++ b/charts/teuto-cnpg/README.md @@ -1,6 +1,6 @@ # teuto-cnpg -![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) A Helm chart to abstract the managing of cnpg-databases from the original resource. @@ -24,6 +24,29 @@ Databases need to be migrated manually: - update helmchart - start cnpg-operator +### 2.x.x -> 3.x.x + +Cloudnative-PG made the in-operator backup deprecated. + +Therefore a migration has to happen where the Backup block is moved +into the Objectstore. + +In the values you need to remove .values.backup.barmanObjectStore block. +Those values now need to be set under .values.backup.s3 like this: + +``` +values: + backup: + s3: + endpointURL: https://api.ffm3.teutostack.de:6780 + path: s3://backup/ + secret: + name: backup-credentials +``` + +accessKeyId and accessSecretKey are set to `ACCESS_KEY_ID` and `accessSecretKeyEY` by default +but can be overwritten with .values.backup.s3.accessKeyId or .values.backup.s3.accessSecretKey. + # cnpg-wrapper configuration **Title:** cnpg-wrapper configuration @@ -186,16 +209,17 @@ Must be one of: ## 7. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `cnpg-wrapper configuration > backup` -| | | -| ------------------------- | --------------------------------------------------------------------------- | -| **Type** | `object` | -| **Additional properties** | ![Any type: allowed](https://img.shields.io/badge/Any%20type-allowed-green) | +| | | +| ------------------------- | -------------------------------------------------------------- | +| **Type** | `object` | +| **Additional properties** | ![Not allowed](https://img.shields.io/badge/Not%20allowed-red) | **Description:** See: https://cloudnative-pg.io/documentation/1.16/backup_recovery/ -| Property | Pattern | Type | Deprecated | Definition | Title/Description | -| ------------------------------- | ------- | ------ | ---------- | ---------- | ----------------- | -| - [schedule](#backup_schedule ) | No | string | No | - | cron syntax | +| Property | Pattern | Type | Deprecated | Definition | Title/Description | +| ------------------------------- | ------- | ------ | ---------- | ---------- | ------------------ | +| - [schedule](#backup_schedule ) | No | string | No | - | cron syntax | +| + [s3](#backup_s3 ) | No | object | No | - | s3 related options | ### 7.1. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `cnpg-wrapper configuration > backup > schedule` @@ -211,6 +235,70 @@ Must be one of: 0 0 0 * * * ``` +### 7.2. ![Required](https://img.shields.io/badge/Required-blue) Property `cnpg-wrapper configuration > backup > s3` + +| | | +| ------------------------- | -------------------------------------------------------------- | +| **Type** | `object` | +| **Additional properties** | ![Not allowed](https://img.shields.io/badge/Not%20allowed-red) | + +**Description:** s3 related options + +| Property | Pattern | Type | Deprecated | Definition | Title/Description | +| ---------------------------------------- | ------- | ------ | ---------- | ---------- | ------------------------- | +| + [path](#backup_s3_path ) | No | string | No | - | s3 path to write files to | +| + [endpointURL](#backup_s3_endpointURL ) | No | string | No | - | url of the api endpoint | +| - [secret](#backup_s3_secret ) | No | object | No | - | - | + +#### 7.2.1. ![Required](https://img.shields.io/badge/Required-blue) Property `cnpg-wrapper configuration > backup > s3 > path` + +| | | +| -------- | -------- | +| **Type** | `string` | + +**Description:** s3 path to write files to + +#### 7.2.2. ![Required](https://img.shields.io/badge/Required-blue) Property `cnpg-wrapper configuration > backup > s3 > endpointURL` + +| | | +| -------- | -------- | +| **Type** | `string` | + +**Description:** url of the api endpoint + +#### 7.2.3. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `cnpg-wrapper configuration > backup > s3 > secret` + +| | | +| ------------------------- | -------------------------------------------------------------- | +| **Type** | `object` | +| **Additional properties** | ![Not allowed](https://img.shields.io/badge/Not%20allowed-red) | + +| Property | Pattern | Type | Deprecated | Definition | Title/Description | +| ------------------------------------------------------- | ------- | ------ | ---------- | ---------- | ----------------- | +| + [name](#backup_s3_secret_name ) | No | string | No | - | - | +| - [accessKeyId](#backup_s3_secret_accessKeyId ) | No | string | No | - | - | +| - [accessSecretKey](#backup_s3_secret_accessSecretKey ) | No | string | No | - | - | + +##### 7.2.3.1. ![Required](https://img.shields.io/badge/Required-blue) Property `cnpg-wrapper configuration > backup > s3 > secret > name` + +| | | +| -------- | -------- | +| **Type** | `string` | + +##### 7.2.3.2. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `cnpg-wrapper configuration > backup > s3 > secret > accessKeyId` + +| | | +| ----------- | ----------------- | +| **Type** | `string` | +| **Default** | `"ACCESS_KEY_ID"` | + +##### 7.2.3.3. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `cnpg-wrapper configuration > backup > s3 > secret > accessSecretKey` + +| | | +| ----------- | --------------------- | +| **Type** | `string` | +| **Default** | `"ACCESS_SECRET_KEY"` | + ## 8. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `cnpg-wrapper configuration > databaseImage` | | |