From b4569a19a1e2de18a3686b403cd1873bfa80f2ee Mon Sep 17 00:00:00 2001 From: Camil Blanaru Date: Tue, 24 Jun 2025 18:40:28 +0200 Subject: [PATCH 1/4] chore(main): release 0.6.0 Signed-off-by: Peggie --- .release-please-manifest.json | 2 +- CHANGELOG.md | 90 ++++++++++++++++++++++++++++ internal/cnpgi/metadata/constants.go | 2 +- 3 files changed, 92 insertions(+), 2 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index f1c1e588..bcd05228 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.5.0" + ".": "0.6.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f45b6d6..51ae50df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,95 @@ # Changelog +## [0.6.0](https://github.com/edkadigital/plugin-barman-cloud/compare/v0.5.0...v0.6.0) (2025-06-24) + + +### Features + +* Add `liveness` and `readiness` probe support ([#69](https://github.com/edkadigital/plugin-barman-cloud/issues/69)) ([5fd9449](https://github.com/edkadigital/plugin-barman-cloud/commit/5fd9449b27394756e0baf76b1356900850f687a6)) +* Additional environment variables ([#81](https://github.com/edkadigital/plugin-barman-cloud/issues/81)) ([be40375](https://github.com/edkadigital/plugin-barman-cloud/commit/be4037529c44858278dd80e3eb32f39f3f68c5c6)) +* **deps:** Update dependency barman to v3.14.0 ([#368](https://github.com/edkadigital/plugin-barman-cloud/issues/368)) ([3550013](https://github.com/edkadigital/plugin-barman-cloud/commit/35500130bf0fe25eb3a191bc78f4818c318acf26)) +* Forbid usage of `.spec.configuration.serverName` in ObjectStore ([#336](https://github.com/edkadigital/plugin-barman-cloud/issues/336)) ([3420f43](https://github.com/edkadigital/plugin-barman-cloud/commit/3420f430739ac8518c83cd3b23bf6a8e42b411f7)), closes [#334](https://github.com/edkadigital/plugin-barman-cloud/issues/334) +* Generate apidoc using genref ([#228](https://github.com/edkadigital/plugin-barman-cloud/issues/228)) ([74bdb9a](https://github.com/edkadigital/plugin-barman-cloud/commit/74bdb9a590f169eade4eea27caa85fc3b1809e41)), closes [#206](https://github.com/edkadigital/plugin-barman-cloud/issues/206) +* Grant permissions to read secrets ([#25](https://github.com/edkadigital/plugin-barman-cloud/issues/25)) ([76383a3](https://github.com/edkadigital/plugin-barman-cloud/commit/76383a30afd3bd829f01936dc3dfc81f1d189d2d)) +* Implement evaluate lifecycle hook ([#222](https://github.com/edkadigital/plugin-barman-cloud/issues/222)) ([a7ef56b](https://github.com/edkadigital/plugin-barman-cloud/commit/a7ef56b6e7a8abfcf312f42190b5c3828f9b2a79)) +* Lenient decoding of CNPG resources ([#192](https://github.com/edkadigital/plugin-barman-cloud/issues/192)) ([13e3fab](https://github.com/edkadigital/plugin-barman-cloud/commit/13e3fab2688ec6ea342ed7304680025f98e6af27)) +* Log the downloaded backup catalog before restore ([#323](https://github.com/edkadigital/plugin-barman-cloud/issues/323)) ([9db184f](https://github.com/edkadigital/plugin-barman-cloud/commit/9db184f5d4c325ed18aeb4fba6c57c28b0e3ae40)), closes [#319](https://github.com/edkadigital/plugin-barman-cloud/issues/319) +* Operator plugin and manifests ([#18](https://github.com/edkadigital/plugin-barman-cloud/issues/18)) ([dd6548c](https://github.com/edkadigital/plugin-barman-cloud/commit/dd6548c4a26031324975d97aee345e4e6a2e7efa)) +* Release-please cleanup ([#115](https://github.com/edkadigital/plugin-barman-cloud/issues/115)) ([cd03c55](https://github.com/edkadigital/plugin-barman-cloud/commit/cd03c556ef86c429b8699961eb24e1361b5759ff)), closes [#114](https://github.com/edkadigital/plugin-barman-cloud/issues/114) +* Retention policy ([#191](https://github.com/edkadigital/plugin-barman-cloud/issues/191)) ([fecd1e9](https://github.com/edkadigital/plugin-barman-cloud/commit/fecd1e9513ce1748a289840f735a2f23a0ce5218)) +* Separate recovery and cluster object store ([#76](https://github.com/edkadigital/plugin-barman-cloud/issues/76)) ([e30edd2](https://github.com/edkadigital/plugin-barman-cloud/commit/e30edd2318d76e10fd7af344c0e4326f1e5033ec)) +* Separate recovery object store from replica source ([#83](https://github.com/edkadigital/plugin-barman-cloud/issues/83)) ([e4735a2](https://github.com/edkadigital/plugin-barman-cloud/commit/e4735a2f85724cf8493f513658783e5330c3efcf)) +* Sidecar injection and loading ([#22](https://github.com/edkadigital/plugin-barman-cloud/issues/22)) ([ea6ee30](https://github.com/edkadigital/plugin-barman-cloud/commit/ea6ee30d2ea30f9e9df22002ce5f5a68fcb37ade)) +* Sidecar role and rolebinding ([#23](https://github.com/edkadigital/plugin-barman-cloud/issues/23)) ([2f62d53](https://github.com/edkadigital/plugin-barman-cloud/commit/2f62d539c949f344cb5534b7ffbb90860663a106)) +* **sidecar:** Add resource requirements and limits ([#307](https://github.com/edkadigital/plugin-barman-cloud/issues/307)) ([4bb3471](https://github.com/edkadigital/plugin-barman-cloud/commit/4bb347121d3328783ca9eceb656863cde37cb8aa)), closes [#253](https://github.com/edkadigital/plugin-barman-cloud/issues/253) +* **spike:** Backup method ([#20](https://github.com/edkadigital/plugin-barman-cloud/issues/20)) ([9fa1c0b](https://github.com/edkadigital/plugin-barman-cloud/commit/9fa1c0beab4882af3f4c737d049b5bafcf7e28a6)) +* **spike:** Restore ([#29](https://github.com/edkadigital/plugin-barman-cloud/issues/29)) ([240077c](https://github.com/edkadigital/plugin-barman-cloud/commit/240077c77192d9572767d7ec76d02e578b94faca)) +* **spike:** Wal-archive and wal-restore methods ([#4](https://github.com/edkadigital/plugin-barman-cloud/issues/4)) ([1c86ff6](https://github.com/edkadigital/plugin-barman-cloud/commit/1c86ff65747b5b348fb1ed2b0e5b0594fd156116)) +* Support additional compression methods in the sidecar image ([#158](https://github.com/edkadigital/plugin-barman-cloud/issues/158)) ([ee5fd84](https://github.com/edkadigital/plugin-barman-cloud/commit/ee5fd840924c0997f301764af32a684aa8424b22)), closes [#127](https://github.com/edkadigital/plugin-barman-cloud/issues/127) +* Support custom CA certificates ([#198](https://github.com/edkadigital/plugin-barman-cloud/issues/198)) ([fcbc472](https://github.com/edkadigital/plugin-barman-cloud/commit/fcbc47209222f712178ba422020c88eef7d50c08)) +* Support lz4, xz, and zstandard compressions ([#201](https://github.com/edkadigital/plugin-barman-cloud/issues/201)) ([795313f](https://github.com/edkadigital/plugin-barman-cloud/commit/795313f4aa2f4888fdf2cb711de74aaea7b045a7)), closes [#200](https://github.com/edkadigital/plugin-barman-cloud/issues/200) +* Support snapshot recovery job ([#258](https://github.com/edkadigital/plugin-barman-cloud/issues/258)) ([e00024f](https://github.com/edkadigital/plugin-barman-cloud/commit/e00024f136996305999c0440ae9b48861828e160)) +* Upgrade Barman to 3.13.0 ([#209](https://github.com/edkadigital/plugin-barman-cloud/issues/209)) ([56d8cce](https://github.com/edkadigital/plugin-barman-cloud/commit/56d8cceb3b8c7a17f3dcdd2dc14b48a725aaea9f)), closes [#208](https://github.com/edkadigital/plugin-barman-cloud/issues/208) +* **wal:** Parallel WAL archiving ([#262](https://github.com/edkadigital/plugin-barman-cloud/issues/262)) ([88fd3e5](https://github.com/edkadigital/plugin-barman-cloud/commit/88fd3e504f35e004fab47ca33a2e67dd40120e2c)), closes [#260](https://github.com/edkadigital/plugin-barman-cloud/issues/260) [#266](https://github.com/edkadigital/plugin-barman-cloud/issues/266) + + +### Bug Fixes + +* Avoid injecting the plugin environment into the PG container ([#62](https://github.com/edkadigital/plugin-barman-cloud/issues/62)) ([9c77e3d](https://github.com/edkadigital/plugin-barman-cloud/commit/9c77e3de9f05a56c567c9fa6b0f75ca55a05ddf8)) +* Controller and sidecar containers run as non-root ([#225](https://github.com/edkadigital/plugin-barman-cloud/issues/225)) ([5788c1f](https://github.com/edkadigital/plugin-barman-cloud/commit/5788c1f72794a331e9176dabc625a5937abff010)), closes [#177](https://github.com/edkadigital/plugin-barman-cloud/issues/177) +* Custom CA support for retention policies ([#224](https://github.com/edkadigital/plugin-barman-cloud/issues/224)) ([bac7b67](https://github.com/edkadigital/plugin-barman-cloud/commit/bac7b673a2ef239dd28bd2d1eced083009ad8ba6)), closes [#220](https://github.com/edkadigital/plugin-barman-cloud/issues/220) +* **deps:** Lock file maintenance documentation dependencies ([#379](https://github.com/edkadigital/plugin-barman-cloud/issues/379)) ([a0327ea](https://github.com/edkadigital/plugin-barman-cloud/commit/a0327ea574558d6c1a913e13a12bb454818900a7)) +* **deps:** Lock file maintenance documentation dependencies ([#399](https://github.com/edkadigital/plugin-barman-cloud/issues/399)) ([7146c51](https://github.com/edkadigital/plugin-barman-cloud/commit/7146c51de11a5d673aef23e36e07a2b0c528d3b7)) +* **deps:** Lock file maintenance documentation dependencies ([#407](https://github.com/edkadigital/plugin-barman-cloud/issues/407)) ([4d323c2](https://github.com/edkadigital/plugin-barman-cloud/commit/4d323c2d3df2bcd52c126b369922bec67db68a2c)) +* **deps:** Update all non-major go dependencies ([#103](https://github.com/edkadigital/plugin-barman-cloud/issues/103)) ([55258f6](https://github.com/edkadigital/plugin-barman-cloud/commit/55258f69008d1475f65d549d47a6c87485624e28)) +* **deps:** Update all non-major go dependencies ([#15](https://github.com/edkadigital/plugin-barman-cloud/issues/15)) ([3289d91](https://github.com/edkadigital/plugin-barman-cloud/commit/3289d91db4f924bad2f7f6dc8901f4544616233e)) +* **deps:** Update all non-major go dependencies ([#152](https://github.com/edkadigital/plugin-barman-cloud/issues/152)) ([e77799a](https://github.com/edkadigital/plugin-barman-cloud/commit/e77799af028ba892ed8f3261554682c1b540a7f5)) +* **deps:** Update all non-major go dependencies ([#19](https://github.com/edkadigital/plugin-barman-cloud/issues/19)) ([3785162](https://github.com/edkadigital/plugin-barman-cloud/commit/378516225d6441dcba32bcd7533d54501d91cf08)) +* **deps:** Update all non-major go dependencies ([#213](https://github.com/edkadigital/plugin-barman-cloud/issues/213)) ([a5b8649](https://github.com/edkadigital/plugin-barman-cloud/commit/a5b8649bd0eac1df6e51291ff197a6a548d0f479)) +* **deps:** Update all non-major go dependencies ([#219](https://github.com/edkadigital/plugin-barman-cloud/issues/219)) ([0d4a3d3](https://github.com/edkadigital/plugin-barman-cloud/commit/0d4a3d38f77e9d51a3f627fa768673e3c4b5e650)) +* **deps:** Update all non-major go dependencies ([#246](https://github.com/edkadigital/plugin-barman-cloud/issues/246)) ([ed1feaa](https://github.com/edkadigital/plugin-barman-cloud/commit/ed1feaaddcddfabd48a2d9a28013e7585d8babd6)) +* **deps:** Update all non-major go dependencies ([#278](https://github.com/edkadigital/plugin-barman-cloud/issues/278)) ([010c9b9](https://github.com/edkadigital/plugin-barman-cloud/commit/010c9b93d4e2d06eb89ba49219f15144c98515cf)) +* **deps:** Update all non-major go dependencies ([#366](https://github.com/edkadigital/plugin-barman-cloud/issues/366)) ([1097abb](https://github.com/edkadigital/plugin-barman-cloud/commit/1097abbd1d26502a3cfc81f932bffd5bef2377a4)) +* **deps:** Update all non-major go dependencies ([#9](https://github.com/edkadigital/plugin-barman-cloud/issues/9)) ([435986b](https://github.com/edkadigital/plugin-barman-cloud/commit/435986b7a1e7bf9e5d4d1c018c37fd6e28f2aaa7)) +* **deps:** Update github.com/cloudnative-pg/cloudnative-pg digest to 34ab236 ([#180](https://github.com/edkadigital/plugin-barman-cloud/issues/180)) ([e9e636a](https://github.com/edkadigital/plugin-barman-cloud/commit/e9e636ada08de4a1f6db0a31e2f133e703580394)) +* **deps:** Update golang.org/x/net ([#188](https://github.com/edkadigital/plugin-barman-cloud/issues/188)) ([aba0748](https://github.com/edkadigital/plugin-barman-cloud/commit/aba07487891b731b6439429c7b30da21bc260d5f)) +* **deps:** Update k8s.io/utils digest to 0f33e8f ([#301](https://github.com/edkadigital/plugin-barman-cloud/issues/301)) ([ab398d7](https://github.com/edkadigital/plugin-barman-cloud/commit/ab398d7d30ebe241b2b682c42c4b129254955b24)) +* **deps:** Update k8s.io/utils digest to 1f6e0b7 ([#237](https://github.com/edkadigital/plugin-barman-cloud/issues/237)) ([792679f](https://github.com/edkadigital/plugin-barman-cloud/commit/792679ff673f60deeac3293d4bfb3e5182a09bef)) +* **deps:** Update k8s.io/utils digest to 24370be ([#90](https://github.com/edkadigital/plugin-barman-cloud/issues/90)) ([1bc5fac](https://github.com/edkadigital/plugin-barman-cloud/commit/1bc5facc9acadbcdb88e76ec294f6c4c050c4daa)) +* **deps:** Update k8s.io/utils digest to 4c0f3b2 ([#392](https://github.com/edkadigital/plugin-barman-cloud/issues/392)) ([e58973c](https://github.com/edkadigital/plugin-barman-cloud/commit/e58973cd55b89c2e4615cf67c85b08627590aae1)) +* **deps:** Update kubernetes packages to v0.31.1 ([#10](https://github.com/edkadigital/plugin-barman-cloud/issues/10)) ([76486c2](https://github.com/edkadigital/plugin-barman-cloud/commit/76486c28637fa10be3b8b5f260d5b626ac142ca4)) +* **deps:** Update kubernetes packages to v0.31.3 ([#64](https://github.com/edkadigital/plugin-barman-cloud/issues/64)) ([c639af1](https://github.com/edkadigital/plugin-barman-cloud/commit/c639af1295123c12d462d52b769ac0c973c22c93)) +* **deps:** Update kubernetes packages to v0.32.1 ([#147](https://github.com/edkadigital/plugin-barman-cloud/issues/147)) ([dbc5550](https://github.com/edkadigital/plugin-barman-cloud/commit/dbc5550c9c503dfb0a6206a244995cdda9d28c1d)) +* **deps:** Update kubernetes packages to v0.32.2 ([#172](https://github.com/edkadigital/plugin-barman-cloud/issues/172)) ([bb9658b](https://github.com/edkadigital/plugin-barman-cloud/commit/bb9658b28c95f9b7e1f202dcf2be76bff7756960)) +* **deps:** Update kubernetes packages to v0.32.3 ([#216](https://github.com/edkadigital/plugin-barman-cloud/issues/216)) ([9d22676](https://github.com/edkadigital/plugin-barman-cloud/commit/9d22676f2a5667b516a4f496ab6188a2333e5333)) +* **deps:** Update kubernetes packages to v0.33.0 ([#281](https://github.com/edkadigital/plugin-barman-cloud/issues/281)) ([c6f36d5](https://github.com/edkadigital/plugin-barman-cloud/commit/c6f36d57562a99175e2d3d446ca2d7e7c36b09c3)) +* **deps:** Update kubernetes packages to v0.33.1 ([#361](https://github.com/edkadigital/plugin-barman-cloud/issues/361)) ([9d4bc45](https://github.com/edkadigital/plugin-barman-cloud/commit/9d4bc456b09b9d79c1ad58f686c8201885ffe4ce)) +* **deps:** Update module github.com/cert-manager/cert-manager to v1.16.2 [security] ([#63](https://github.com/edkadigital/plugin-barman-cloud/issues/63)) ([53d2c09](https://github.com/edkadigital/plugin-barman-cloud/commit/53d2c0999313b1447d873b27b1f87e1dd93c6e6a)) +* **deps:** Update module github.com/cloudnative-pg/api to v1 ([#131](https://github.com/edkadigital/plugin-barman-cloud/issues/131)) ([0c8ff74](https://github.com/edkadigital/plugin-barman-cloud/commit/0c8ff7426ff15623deba0c9603ba76dece3cb6a5)) +* **deps:** Update module github.com/cloudnative-pg/cnpg-i-machinery to v0.1.2 ([#182](https://github.com/edkadigital/plugin-barman-cloud/issues/182)) ([12cd519](https://github.com/edkadigital/plugin-barman-cloud/commit/12cd5195234ee17ca0b09c2448cc9dc50c614149)) +* **deps:** Update module google.golang.org/grpc to v1.71.0 ([#187](https://github.com/edkadigital/plugin-barman-cloud/issues/187)) ([e1f1660](https://github.com/edkadigital/plugin-barman-cloud/commit/e1f166023f55fb02d987ac011e3580af1f9d273a)) +* **deps:** Update module google.golang.org/grpc to v1.72.1 ([#345](https://github.com/edkadigital/plugin-barman-cloud/issues/345)) ([d9fd8dd](https://github.com/edkadigital/plugin-barman-cloud/commit/d9fd8dd8681e33ec64c911eade3516a73f793ac5)) +* **deps:** Update module google.golang.org/grpc to v1.73.0 ([#394](https://github.com/edkadigital/plugin-barman-cloud/issues/394)) ([1365906](https://github.com/edkadigital/plugin-barman-cloud/commit/1365906204d895cac78ef93d5753d0b5f717c9ac)) +* **deps:** Update module k8s.io/client-go to v0.31.1 ([#16](https://github.com/edkadigital/plugin-barman-cloud/issues/16)) ([cbefe26](https://github.com/edkadigital/plugin-barman-cloud/commit/cbefe26440203e88f8d60335b64f32b01249ba0d)) +* **deps:** Update module sigs.k8s.io/controller-runtime to v0.19.2 ([#67](https://github.com/edkadigital/plugin-barman-cloud/issues/67)) ([74d4f5d](https://github.com/edkadigital/plugin-barman-cloud/commit/74d4f5d1902ed557375adff3e775b35dd662d2fc)) +* **deps:** Update module sigs.k8s.io/controller-runtime to v0.19.3 ([#78](https://github.com/edkadigital/plugin-barman-cloud/issues/78)) ([497022f](https://github.com/edkadigital/plugin-barman-cloud/commit/497022f1967c90598285573bc54341d22308f2f0)) +* **deps:** Update module sigs.k8s.io/controller-runtime to v0.21.0 ([#367](https://github.com/edkadigital/plugin-barman-cloud/issues/367)) ([fecc2f7](https://github.com/edkadigital/plugin-barman-cloud/commit/fecc2f7d28e5ad58c6370f0a26014908ce4caaaf)) +* **deps:** Update module sigs.k8s.io/kustomize/api to v0.18.0 ([#51](https://github.com/edkadigital/plugin-barman-cloud/issues/51)) ([b2d3032](https://github.com/edkadigital/plugin-barman-cloud/commit/b2d303205499ccca426fe2b72964eeefa6556fdd)) +* **deps:** Update module sigs.k8s.io/kustomize/api to v0.19.0 ([#148](https://github.com/edkadigital/plugin-barman-cloud/issues/148)) ([9ba6351](https://github.com/edkadigital/plugin-barman-cloud/commit/9ba63518f929748f4a422eaa58293c8125b7a5f1)) +* **deps:** Update react monorepo to v19.1.0 ([#286](https://github.com/edkadigital/plugin-barman-cloud/issues/286)) ([99f31a1](https://github.com/edkadigital/plugin-barman-cloud/commit/99f31a1e5e0313534699c49393edc6beabac60ec)) +* **deps:** Use latest commit from CNPG 1.25 branch ([#178](https://github.com/edkadigital/plugin-barman-cloud/issues/178)) ([dfbeaf8](https://github.com/edkadigital/plugin-barman-cloud/commit/dfbeaf802ec98357fdbb92b5fcefc38a29939cfe)) +* Do not add barman-certificates projection if not needed ([#354](https://github.com/edkadigital/plugin-barman-cloud/issues/354)) ([918823d](https://github.com/edkadigital/plugin-barman-cloud/commit/918823dbf1c78e5460f83af50bf85be6c1aefafe)) +* **docs:** Fix TOC links ([#261](https://github.com/edkadigital/plugin-barman-cloud/issues/261)) ([2bb5e90](https://github.com/edkadigital/plugin-barman-cloud/commit/2bb5e90357b2defd6fdaa8ff9982e21f58bc5ecc)) +* **docs:** Replace "no downtime" with "without data loss" ([#349](https://github.com/edkadigital/plugin-barman-cloud/issues/349)) ([5e1b845](https://github.com/edkadigital/plugin-barman-cloud/commit/5e1b845caedb67cf79173af3a319d55260b21627)) +* Duplicate certificate projections ([#331](https://github.com/edkadigital/plugin-barman-cloud/issues/331)) ([8c20e4f](https://github.com/edkadigital/plugin-barman-cloud/commit/8c20e4fe8578b5b18277ce2ae8ba11783b1cac84)), closes [#329](https://github.com/edkadigital/plugin-barman-cloud/issues/329) +* Ensure restore configuration points to manager `wal-restore` ([#68](https://github.com/edkadigital/plugin-barman-cloud/issues/68)) ([afd4603](https://github.com/edkadigital/plugin-barman-cloud/commit/afd4603023ce0f245687856eb05d9a30875b8bac)) +* Exit code 0 on clean shutdown ([#70](https://github.com/edkadigital/plugin-barman-cloud/issues/70)) ([9d8fa07](https://github.com/edkadigital/plugin-barman-cloud/commit/9d8fa079fec6b82c5aef6397b4b6318fbe9ebb0b)) +* Obsolete deepcopy ([1e6c69b](https://github.com/edkadigital/plugin-barman-cloud/commit/1e6c69bac022914732fbaabb5bae0969893f5049)) +* Remove lifecycle `Pod` `Patch` subscription ([#378](https://github.com/edkadigital/plugin-barman-cloud/issues/378)) ([40316b5](https://github.com/edkadigital/plugin-barman-cloud/commit/40316b5f2d72deac0f042ceecd271a97b369a62f)) +* Replica source object store on replica clusters being promoted ([#96](https://github.com/edkadigital/plugin-barman-cloud/issues/96)) ([4656d44](https://github.com/edkadigital/plugin-barman-cloud/commit/4656d44c85a3d05e38cb536b2db69aa47c575619)) +* Role patching ([#325](https://github.com/edkadigital/plugin-barman-cloud/issues/325)) ([f484b9e](https://github.com/edkadigital/plugin-barman-cloud/commit/f484b9e748ad776f7ecec0ed83a2b2424fde2dfc)), closes [#318](https://github.com/edkadigital/plugin-barman-cloud/issues/318) +* Use a fixed golangci-lint version ([#230](https://github.com/edkadigital/plugin-barman-cloud/issues/230)) ([78fe21b](https://github.com/edkadigital/plugin-barman-cloud/commit/78fe21b24dc9366c34260babe6b049a310abe9f0)) + ## [0.5.0](https://github.com/cloudnative-pg/plugin-barman-cloud/compare/v0.4.1...v0.5.0) (2025-06-03) diff --git a/internal/cnpgi/metadata/constants.go b/internal/cnpgi/metadata/constants.go index 95f4f618..3a5392ae 100644 --- a/internal/cnpgi/metadata/constants.go +++ b/internal/cnpgi/metadata/constants.go @@ -24,7 +24,7 @@ const ( // Data is the metadata of this plugin. var Data = identity.GetPluginMetadataResponse{ Name: PluginName, - Version: "0.5.0", // x-release-please-version + Version: "0.6.0", // x-release-please-version DisplayName: "BarmanCloudInstance", ProjectUrl: "https://github.com/cloudnative-pg/plugin-barman-cloud", RepositoryUrl: "https://github.com/cloudnative-pg/plugin-barman-cloud", From 772f94b04373ab2b8f9a35b34d66790b899ea0ae Mon Sep 17 00:00:00 2001 From: Camil Blanaru Date: Tue, 24 Jun 2025 19:32:02 +0200 Subject: [PATCH 2/4] Update import paths from cloudnative-pg to edkadigital --- cmd/manager/main.go | 8 ++++---- internal/cmd/healthcheck/main.go | 2 +- internal/cmd/instance/main.go | 2 +- internal/cmd/operator/main.go | 2 +- internal/cmd/restore/main.go | 2 +- internal/cnpgi/common/common.go | 2 +- internal/cnpgi/common/wal.go | 6 +++--- internal/cnpgi/instance/backup.go | 6 +++--- internal/cnpgi/instance/identity.go | 2 +- .../cnpgi/instance/internal/client/client_test.go | 2 +- internal/cnpgi/instance/manager.go | 4 ++-- internal/cnpgi/instance/retention.go | 8 ++++---- internal/cnpgi/instance/start.go | 2 +- internal/cnpgi/instance/types.go | 2 +- internal/cnpgi/metadata/constants.go | 6 +++--- internal/cnpgi/operator/config/config.go | 2 +- internal/cnpgi/operator/identity.go | 2 +- internal/cnpgi/operator/lifecycle.go | 4 ++-- internal/cnpgi/operator/lifecycle_certificates.go | 6 +++--- internal/cnpgi/operator/lifecycle_envs.go | 4 ++-- internal/cnpgi/operator/lifecycle_resources.go | 4 ++-- internal/cnpgi/operator/lifecycle_test.go | 2 +- internal/cnpgi/operator/manager.go | 4 ++-- internal/cnpgi/operator/reconciler.go | 6 +++--- internal/cnpgi/operator/specs/role.go | 2 +- internal/cnpgi/restore/identity.go | 2 +- internal/cnpgi/restore/manager.go | 2 +- internal/cnpgi/restore/restore.go | 8 ++++---- internal/cnpgi/restore/start.go | 2 +- internal/controller/objectstore_controller.go | 2 +- internal/controller/objectstore_controller_test.go | 2 +- internal/controller/suite_test.go | 2 +- test/e2e/e2e_suite_test.go | 12 ++++++------ test/e2e/internal/certmanager/certmanager.go | 4 ++-- test/e2e/internal/client/client.go | 2 +- test/e2e/internal/cloudnativepg/cloudnativepg.go | 4 ++-- test/e2e/internal/e2etestenv/main.go | 4 ++-- test/e2e/internal/objectstore/azurite.go | 2 +- test/e2e/internal/objectstore/fakegcsserver.go | 2 +- test/e2e/internal/objectstore/minio.go | 2 +- test/e2e/internal/tests/backup/backup_restore.go | 8 ++++---- test/e2e/internal/tests/backup/fixtures.go | 4 ++-- test/e2e/internal/tests/replicacluster/fixtures.go | 4 ++-- .../internal/tests/replicacluster/replica_cluster.go | 8 ++++---- 44 files changed, 84 insertions(+), 84 deletions(-) diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 1cf436ec..24e83afa 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -10,10 +10,10 @@ import ( "github.com/spf13/cobra" ctrl "sigs.k8s.io/controller-runtime" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cmd/healthcheck" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cmd/instance" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cmd/operator" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cmd/restore" + "github.com/edkadigital/plugin-barman-cloud/internal/cmd/healthcheck" + "github.com/edkadigital/plugin-barman-cloud/internal/cmd/instance" + "github.com/edkadigital/plugin-barman-cloud/internal/cmd/operator" + "github.com/edkadigital/plugin-barman-cloud/internal/cmd/restore" ) func main() { diff --git a/internal/cmd/healthcheck/main.go b/internal/cmd/healthcheck/main.go index efc86a9e..aae1d54a 100644 --- a/internal/cmd/healthcheck/main.go +++ b/internal/cmd/healthcheck/main.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/health/grpc_health_v1" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata" ) // NewCmd returns the healthcheck command diff --git a/internal/cmd/instance/main.go b/internal/cmd/instance/main.go index 1b4a133b..59892ba2 100644 --- a/internal/cmd/instance/main.go +++ b/internal/cmd/instance/main.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/instance" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/instance" ) // NewCmd creates a new instance command diff --git a/internal/cmd/operator/main.go b/internal/cmd/operator/main.go index b5b685ec..48994356 100644 --- a/internal/cmd/operator/main.go +++ b/internal/cmd/operator/main.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator" ) // NewCmd creates a new operator command diff --git a/internal/cmd/restore/main.go b/internal/cmd/restore/main.go index 13ac0770..250e4852 100644 --- a/internal/cmd/restore/main.go +++ b/internal/cmd/restore/main.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/restore" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/restore" ) // NewCmd creates the "restore" subcommand diff --git a/internal/cnpgi/common/common.go b/internal/cnpgi/common/common.go index 870aecd7..64ed12ba 100644 --- a/internal/cnpgi/common/common.go +++ b/internal/cnpgi/common/common.go @@ -7,7 +7,7 @@ import ( barmanapi "github.com/cloudnative-pg/barman-cloud/pkg/api" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata" ) // TODO: refactor. diff --git a/internal/cnpgi/common/wal.go b/internal/cnpgi/common/wal.go index ef8dfbcc..f3c82712 100644 --- a/internal/cnpgi/common/wal.go +++ b/internal/cnpgi/common/wal.go @@ -21,9 +21,9 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config" ) // ErrMissingPermissions is raised when the sidecar has no diff --git a/internal/cnpgi/instance/backup.go b/internal/cnpgi/instance/backup.go index 23b57ca3..0ea09979 100644 --- a/internal/cnpgi/instance/backup.go +++ b/internal/cnpgi/instance/backup.go @@ -16,9 +16,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/common" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config" ) // BackupServiceImplementation is the implementation diff --git a/internal/cnpgi/instance/identity.go b/internal/cnpgi/instance/identity.go index ef9c8458..ba84ff17 100644 --- a/internal/cnpgi/instance/identity.go +++ b/internal/cnpgi/instance/identity.go @@ -6,7 +6,7 @@ import ( "github.com/cloudnative-pg/cnpg-i/pkg/identity" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata" ) // IdentityImplementation implements IdentityServer diff --git a/internal/cnpgi/instance/internal/client/client_test.go b/internal/cnpgi/instance/internal/client/client_test.go index 70568f45..111b010f 100644 --- a/internal/cnpgi/instance/internal/client/client_test.go +++ b/internal/cnpgi/instance/internal/client/client_test.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - v1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" + v1 "github.com/edkadigital/plugin-barman-cloud/api/v1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/cnpgi/instance/manager.go b/internal/cnpgi/instance/manager.go index e0f3aeb6..9e2328b0 100644 --- a/internal/cnpgi/instance/manager.go +++ b/internal/cnpgi/instance/manager.go @@ -17,8 +17,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/scheme" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" - extendedclient "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/instance/internal/client" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" + extendedclient "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/instance/internal/client" ) // Start starts the sidecar informers and CNPG-i server diff --git a/internal/cnpgi/instance/retention.go b/internal/cnpgi/instance/retention.go index 37f475e1..8b566c50 100644 --- a/internal/cnpgi/instance/retention.go +++ b/internal/cnpgi/instance/retention.go @@ -18,10 +18,10 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/common" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config" ) // defaultRetentionPolicyInterval is the retention policy interval diff --git a/internal/cnpgi/instance/start.go b/internal/cnpgi/instance/start.go index 5eefa793..33252664 100644 --- a/internal/cnpgi/instance/start.go +++ b/internal/cnpgi/instance/start.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/common" ) // CNPGI is the implementation of the PostgreSQL sidecar diff --git a/internal/cnpgi/instance/types.go b/internal/cnpgi/instance/types.go index f2d44129..e5334961 100644 --- a/internal/cnpgi/instance/types.go +++ b/internal/cnpgi/instance/types.go @@ -5,7 +5,7 @@ import ( "k8s.io/apimachinery/pkg/types" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata" ) type backupResultMetadata struct { diff --git a/internal/cnpgi/metadata/constants.go b/internal/cnpgi/metadata/constants.go index 3a5392ae..e2a958f3 100644 --- a/internal/cnpgi/metadata/constants.go +++ b/internal/cnpgi/metadata/constants.go @@ -26,9 +26,9 @@ var Data = identity.GetPluginMetadataResponse{ Name: PluginName, Version: "0.6.0", // x-release-please-version DisplayName: "BarmanCloudInstance", - ProjectUrl: "https://github.com/cloudnative-pg/plugin-barman-cloud", - RepositoryUrl: "https://github.com/cloudnative-pg/plugin-barman-cloud", + ProjectUrl: "https://github.com/edkadigital/plugin-barman-cloud", + RepositoryUrl: "https://github.com/edkadigital/plugin-barman-cloud", License: "APACHE 2.0", - LicenseUrl: "https://github.com/cloudnative-pg/plugin-barman-cloud/LICENSE", + LicenseUrl: "https://github.com/edkadigital/plugin-barman-cloud/LICENSE", Maturity: "alpha", } diff --git a/internal/cnpgi/operator/config/config.go b/internal/cnpgi/operator/config/config.go index f040aee9..3d2f1e86 100644 --- a/internal/cnpgi/operator/config/config.go +++ b/internal/cnpgi/operator/config/config.go @@ -8,7 +8,7 @@ import ( "github.com/cloudnative-pg/machinery/pkg/stringset" "k8s.io/apimachinery/pkg/types" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata" ) // ConfigurationError represents a mistake in the plugin configuration diff --git a/internal/cnpgi/operator/identity.go b/internal/cnpgi/operator/identity.go index fd933ce4..ba455193 100644 --- a/internal/cnpgi/operator/identity.go +++ b/internal/cnpgi/operator/identity.go @@ -5,7 +5,7 @@ import ( "github.com/cloudnative-pg/cnpg-i/pkg/identity" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata" ) // IdentityImplementation is the implementation of the CNPG-i diff --git a/internal/cnpgi/operator/lifecycle.go b/internal/cnpgi/operator/lifecycle.go index d5c99185..5c4efa1e 100644 --- a/internal/cnpgi/operator/lifecycle.go +++ b/internal/cnpgi/operator/lifecycle.go @@ -17,8 +17,8 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config" ) // LifecycleImplementation is the implementation of the lifecycle handler diff --git a/internal/cnpgi/operator/lifecycle_certificates.go b/internal/cnpgi/operator/lifecycle_certificates.go index 800612ec..d70c84a1 100644 --- a/internal/cnpgi/operator/lifecycle_certificates.go +++ b/internal/cnpgi/operator/lifecycle_certificates.go @@ -7,9 +7,9 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config" ) // barmanCertificatesVolumeName is the name of the volume that hosts diff --git a/internal/cnpgi/operator/lifecycle_envs.go b/internal/cnpgi/operator/lifecycle_envs.go index e51b5c8b..6856e1ff 100644 --- a/internal/cnpgi/operator/lifecycle_envs.go +++ b/internal/cnpgi/operator/lifecycle_envs.go @@ -6,8 +6,8 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config" ) func (impl LifecycleImplementation) collectAdditionalEnvs( diff --git a/internal/cnpgi/operator/lifecycle_resources.go b/internal/cnpgi/operator/lifecycle_resources.go index a68339b8..de0873f5 100644 --- a/internal/cnpgi/operator/lifecycle_resources.go +++ b/internal/cnpgi/operator/lifecycle_resources.go @@ -5,8 +5,8 @@ import ( corev1 "k8s.io/api/core/v1" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config" ) func (impl LifecycleImplementation) collectSidecarResourcesForRecoveryJob( diff --git a/internal/cnpgi/operator/lifecycle_test.go b/internal/cnpgi/operator/lifecycle_test.go index c3235ded..6368f29b 100644 --- a/internal/cnpgi/operator/lifecycle_test.go +++ b/internal/cnpgi/operator/lifecycle_test.go @@ -10,7 +10,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/cnpgi/operator/manager.go b/internal/cnpgi/operator/manager.go index f51d269c..b83a3254 100644 --- a/internal/cnpgi/operator/manager.go +++ b/internal/cnpgi/operator/manager.go @@ -33,8 +33,8 @@ import ( metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/controller" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" + "github.com/edkadigital/plugin-barman-cloud/internal/controller" // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. diff --git a/internal/cnpgi/operator/reconciler.go b/internal/cnpgi/operator/reconciler.go index ec80f13f..78fd6578 100644 --- a/internal/cnpgi/operator/reconciler.go +++ b/internal/cnpgi/operator/reconciler.go @@ -13,9 +13,9 @@ import ( apierrs "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/specs" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/specs" ) // ReconcilerImplementation implements the Reconciler capability diff --git a/internal/cnpgi/operator/specs/role.go b/internal/cnpgi/operator/specs/role.go index c9f83ef7..2deabec2 100644 --- a/internal/cnpgi/operator/specs/role.go +++ b/internal/cnpgi/operator/specs/role.go @@ -8,7 +8,7 @@ import ( rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" ) // BuildRole builds the Role object for this cluster diff --git a/internal/cnpgi/restore/identity.go b/internal/cnpgi/restore/identity.go index 2308898b..98376aac 100644 --- a/internal/cnpgi/restore/identity.go +++ b/internal/cnpgi/restore/identity.go @@ -6,7 +6,7 @@ import ( "github.com/cloudnative-pg/cnpg-i/pkg/identity" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata" ) // IdentityImplementation implements IdentityServer diff --git a/internal/cnpgi/restore/manager.go b/internal/cnpgi/restore/manager.go index aae2ebf1..1f24d7a1 100644 --- a/internal/cnpgi/restore/manager.go +++ b/internal/cnpgi/restore/manager.go @@ -13,7 +13,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" ) var scheme = runtime.NewScheme() diff --git a/internal/cnpgi/restore/restore.go b/internal/cnpgi/restore/restore.go index 03c8941f..06ede11f 100644 --- a/internal/cnpgi/restore/restore.go +++ b/internal/cnpgi/restore/restore.go @@ -26,10 +26,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/metadata" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/operator/config" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/common" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/metadata" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/operator/config" ) const ( diff --git a/internal/cnpgi/restore/start.go b/internal/cnpgi/restore/start.go index 6f216039..48ddf89c 100644 --- a/internal/cnpgi/restore/start.go +++ b/internal/cnpgi/restore/start.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloudnative-pg/plugin-barman-cloud/internal/cnpgi/common" + "github.com/edkadigital/plugin-barman-cloud/internal/cnpgi/common" ) // CNPGI is the implementation of the PostgreSQL sidecar diff --git a/internal/controller/objectstore_controller.go b/internal/controller/objectstore_controller.go index d68b2d38..d586b89d 100644 --- a/internal/controller/objectstore_controller.go +++ b/internal/controller/objectstore_controller.go @@ -25,7 +25,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" ) // ObjectStoreReconciler reconciles a ObjectStore object. diff --git a/internal/controller/objectstore_controller_test.go b/internal/controller/objectstore_controller_test.go index d3ccd7a6..3d1a12ec 100644 --- a/internal/controller/objectstore_controller_test.go +++ b/internal/controller/objectstore_controller_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/reconcile" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go index d58ef201..ab56ed46 100644 --- a/internal/controller/suite_test.go +++ b/internal/controller/suite_test.go @@ -31,7 +31,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - barmancloudv1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" + barmancloudv1 "github.com/edkadigital/plugin-barman-cloud/api/v1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index 6cbd06d1..e2a501a7 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -28,13 +28,13 @@ import ( kustomizeTypes "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/resid" - internalClient "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/client" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/deployment" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/e2etestenv" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/kustomize" + internalClient "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/client" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/deployment" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/e2etestenv" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/kustomize" - _ "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/tests/backup" - _ "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/tests/replicacluster" + _ "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/tests/backup" + _ "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/tests/replicacluster" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/internal/certmanager/certmanager.go b/test/e2e/internal/certmanager/certmanager.go index 0e1e2edf..818bb80f 100644 --- a/test/e2e/internal/certmanager/certmanager.go +++ b/test/e2e/internal/certmanager/certmanager.go @@ -25,8 +25,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/kustomize/api/types" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/deployment" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/kustomize" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/deployment" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/kustomize" ) // InstallOptions contains the options for installing cert-manager. diff --git a/test/e2e/internal/client/client.go b/test/e2e/internal/client/client.go index fd58581e..b6b75d1e 100644 --- a/test/e2e/internal/client/client.go +++ b/test/e2e/internal/client/client.go @@ -31,7 +31,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" - pluginBarmanCloudV1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" + pluginBarmanCloudV1 "github.com/edkadigital/plugin-barman-cloud/api/v1" ) // NewClient creates a new controller-runtime Kubernetes client. diff --git a/test/e2e/internal/cloudnativepg/cloudnativepg.go b/test/e2e/internal/cloudnativepg/cloudnativepg.go index 63257384..23366d9a 100644 --- a/test/e2e/internal/cloudnativepg/cloudnativepg.go +++ b/test/e2e/internal/cloudnativepg/cloudnativepg.go @@ -27,8 +27,8 @@ import ( "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/resid" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/deployment" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/kustomize" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/deployment" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/kustomize" ) // InstallCloudNativePGOptions contains the options for installing CloudNativePG. diff --git a/test/e2e/internal/e2etestenv/main.go b/test/e2e/internal/e2etestenv/main.go index e7aad8d7..40df258c 100644 --- a/test/e2e/internal/e2etestenv/main.go +++ b/test/e2e/internal/e2etestenv/main.go @@ -23,8 +23,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/certmanager" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/cloudnativepg" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/certmanager" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/cloudnativepg" ) // SetupOptions contains the options for setting up the test environment. diff --git a/test/e2e/internal/objectstore/azurite.go b/test/e2e/internal/objectstore/azurite.go index 7a22222f..b3084823 100644 --- a/test/e2e/internal/objectstore/azurite.go +++ b/test/e2e/internal/objectstore/azurite.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - pluginBarmanCloudV1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" + pluginBarmanCloudV1 "github.com/edkadigital/plugin-barman-cloud/api/v1" ) // NewAzuriteObjectStoreResources creates the resources required to create an Azurite object store. diff --git a/test/e2e/internal/objectstore/fakegcsserver.go b/test/e2e/internal/objectstore/fakegcsserver.go index 7818dcab..a8a49a01 100644 --- a/test/e2e/internal/objectstore/fakegcsserver.go +++ b/test/e2e/internal/objectstore/fakegcsserver.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - pluginBarmanCloudV1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" + pluginBarmanCloudV1 "github.com/edkadigital/plugin-barman-cloud/api/v1" ) // NewGCSObjectStoreResources creates the resources required to create a GCS object store. diff --git a/test/e2e/internal/objectstore/minio.go b/test/e2e/internal/objectstore/minio.go index 3ad6e9c1..10655ad9 100644 --- a/test/e2e/internal/objectstore/minio.go +++ b/test/e2e/internal/objectstore/minio.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - pluginBarmanCloudV1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" + pluginBarmanCloudV1 "github.com/edkadigital/plugin-barman-cloud/api/v1" ) // NewMinioObjectStoreResources creates the resources required to create a Minio object store. diff --git a/test/e2e/internal/tests/backup/backup_restore.go b/test/e2e/internal/tests/backup/backup_restore.go index 4cd50728..e32ceeea 100644 --- a/test/e2e/internal/tests/backup/backup_restore.go +++ b/test/e2e/internal/tests/backup/backup_restore.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - internalClient "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/client" - internalCluster "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/cluster" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/command" - nmsp "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/namespace" + internalClient "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/client" + internalCluster "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/cluster" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/command" + nmsp "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/namespace" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/internal/tests/backup/fixtures.go b/test/e2e/internal/tests/backup/fixtures.go index afba3a2f..9cfb9d67 100644 --- a/test/e2e/internal/tests/backup/fixtures.go +++ b/test/e2e/internal/tests/backup/fixtures.go @@ -27,8 +27,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - pluginBarmanCloudV1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/objectstore" + pluginBarmanCloudV1 "github.com/edkadigital/plugin-barman-cloud/api/v1" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/objectstore" ) const ( diff --git a/test/e2e/internal/tests/replicacluster/fixtures.go b/test/e2e/internal/tests/replicacluster/fixtures.go index e4740520..b7b9d5e5 100644 --- a/test/e2e/internal/tests/replicacluster/fixtures.go +++ b/test/e2e/internal/tests/replicacluster/fixtures.go @@ -6,8 +6,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/ptr" - pluginBarmanCloudV1 "github.com/cloudnative-pg/plugin-barman-cloud/api/v1" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/objectstore" + pluginBarmanCloudV1 "github.com/edkadigital/plugin-barman-cloud/api/v1" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/objectstore" ) type testCaseFactory interface { diff --git a/test/e2e/internal/tests/replicacluster/replica_cluster.go b/test/e2e/internal/tests/replicacluster/replica_cluster.go index cc1b8fba..44c081ce 100644 --- a/test/e2e/internal/tests/replicacluster/replica_cluster.go +++ b/test/e2e/internal/tests/replicacluster/replica_cluster.go @@ -27,10 +27,10 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - internalClient "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/client" - cluster2 "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/cluster" - "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/command" - nmsp "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/namespace" + internalClient "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/client" + cluster2 "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/cluster" + "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/command" + nmsp "github.com/edkadigital/plugin-barman-cloud/test/e2e/internal/namespace" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" From 6389d8ae1a7719cec93e510509fe12d2c49d8f36 Mon Sep 17 00:00:00 2001 From: Camil Blanaru Date: Tue, 24 Jun 2025 19:53:41 +0200 Subject: [PATCH 3/4] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7b0fc717..55b39ae1 100644 --- a/Makefile +++ b/Makefile @@ -80,11 +80,11 @@ lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes .PHONY: build build: manifests generate fmt vet ## Build manager binary. - go build -o bin/manager cmd/main.go + go build -o bin/manager cmd/manager/main.go .PHONY: run run: manifests generate fmt vet ## Run a controller from your host. - go run ./cmd/main.go + go run ./cmd/manager/main.go # If you wish to build the manager image targeting other platforms you can use the --platform flag. # (i.e. docker build --platform linux/arm64). However, you must enable docker buildKit for it. @@ -159,9 +159,9 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint ## Tool Versions KUSTOMIZE_VERSION ?= v5.4.3 -CONTROLLER_TOOLS_VERSION ?= v0.16.1 +CONTROLLER_TOOLS_VERSION ?= v0.18.0 ENVTEST_VERSION ?= release-0.19 -GOLANGCI_LINT_VERSION ?= v1.64.8 +GOLANGCI_LINT_VERSION ?= v2.1.6 .PHONY: kustomize kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. From d05962f301ef9c8190e3d5407e53ee46dd4c1883 Mon Sep 17 00:00:00 2001 From: Camil Blanaru Date: Tue, 24 Jun 2025 19:56:50 +0200 Subject: [PATCH 4/4] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 55b39ae1..833a3bb7 100644 --- a/Makefile +++ b/Makefile @@ -161,7 +161,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint KUSTOMIZE_VERSION ?= v5.4.3 CONTROLLER_TOOLS_VERSION ?= v0.18.0 ENVTEST_VERSION ?= release-0.19 -GOLANGCI_LINT_VERSION ?= v2.1.6 +GOLANGCI_LINT_VERSION ?= v1.62.2 .PHONY: kustomize kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.