From 854d5f7a8cc3a950b60a06a891db2be91cb6c1ad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 21 Apr 2026 02:22:08 +0000 Subject: [PATCH 1/2] chore: release main --- .release-please-manifest.json | 2 +- CHANGELOG.md | 19 +++++++++++++++++++ charts/haproxy-operator/Chart.yaml | 10 ++-------- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 2be9c43..0ee8c01 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.2.0" + ".": "0.3.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 96fc382..6e876e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [0.3.0](https://github.com/bcit-tlu/haproxy-operator/compare/v0.2.0...v0.3.0) (2026-04-21) + + +### Features + +* **ci:** unify image, chart, and release versions under release-please lineage ([#10](https://github.com/bcit-tlu/haproxy-operator/issues/10)) ([db7fcb5](https://github.com/bcit-tlu/haproxy-operator/commit/db7fcb5d48a63e88ef82a72ca4a98a2d23a518ab)) +* scaffold haproxy-operator with Flux GitOps, SPIRE mTLS, and VSO integration ([7e80e93](https://github.com/bcit-tlu/haproxy-operator/commit/7e80e935b0ef2c450f562969e133b0e7149ad2e1)) + + +### Bug Fixes + +* address Devin Review findings — SPIRE lifecycle, double validation, dynamic RootCAs, unit tests ([4985dc0](https://github.com/bcit-tlu/haproxy-operator/commit/4985dc00b42410194f5440949ee438b06e4ac429)) +* **ci:** unblock image job on private-repo SARIF upload ([#11](https://github.com/bcit-tlu/haproxy-operator/issues/11)) ([8e40960](https://github.com/bcit-tlu/haproxy-operator/commit/8e409607fde6acb4a35f635a02d70983a1d89943)) +* clear LastFailedHashAnnotation on successful apply ([0616620](https://github.com/bcit-tlu/haproxy-operator/commit/06166202ca8c472ba69125b8b5ce4593c9b989bd)) +* retry client init on failure, context-aware waitForReady, deduplicate events ([f66f835](https://github.com/bcit-tlu/haproxy-operator/commit/f66f835116c4647aca056e4ce7b55b7729d67112)) +* SPIRE source leak on client error, atomic file watch, example config indent ([ac48a4f](https://github.com/bcit-tlu/haproxy-operator/commit/ac48a4f3df16b9b8f144296a1c30bfa00cf75dc8)) +* store status-message in annotations, skip failed-hash retry loop, add tests ([4a23d60](https://github.com/bcit-tlu/haproxy-operator/commit/4a23d603d22487938518d7694aa8a26da3343189)) +* use modern httpchk syntax for HAProxy 2.2+ in dev examples ([5954e82](https://github.com/bcit-tlu/haproxy-operator/commit/5954e820ae203788e70f94ef4fb7623fa2f19728)) + ## [0.2.0](https://github.com/bcit-tlu/haproxy-operator/compare/haproxy-operator-v0.1.0...haproxy-operator-v0.2.0) (2026-04-18) diff --git a/charts/haproxy-operator/Chart.yaml b/charts/haproxy-operator/Chart.yaml index 9ef6f77..fa4a1d8 100644 --- a/charts/haproxy-operator/Chart.yaml +++ b/charts/haproxy-operator/Chart.yaml @@ -3,12 +3,6 @@ name: haproxy-operator description: >- Kubernetes operator that reconciles HAProxy configuration via the Dataplane API -# Chart version and app version are kept in lockstep with the -# release-please lineage — both lines carry the `x-release-please-version` -# marker so every release bumps them together, and CI stamps the same -# string into both fields at publish time. This keeps the GitHub release, -# git tag, image tag, and chart OCI tag identical so operators can trace -# any deployed pod back to a single version string. -version: 0.2.0 # x-release-please-version -appVersion: "0.2.0" # x-release-please-version +version: 0.3.0 +appVersion: 0.2.0 type: application From 00c87412b1ab6a05e9c063af4ba6eac7c23d91ed Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 21 Apr 2026 02:36:55 +0000 Subject: [PATCH 2/2] fix(release): bump appVersion and preserve release-please markers release-please's default updater for Chart.yaml only bumps 'version:' and strips inline YAML comments (including the 'x-release-please-version' markers), leaving appVersion frozen at the previous release and deleting the markers the next release-please run needs to locate the lines. - Restore appVersion to 0.3.0 so the committed chart matches the release (CI's sed commands in .github/workflows/ci.yaml also stamp the same value at publish time, but the committed Chart.yaml is what helm install uses from the repo source). - Restore both 'x-release-please-version' markers and the explanatory comment block. - Pin the extra-files entry for Chart.yaml to the 'generic' updater so future release-please runs preserve the markers and update both 'version' and 'appVersion' in lockstep. Co-Authored-By: kyle_hunter@bcit.ca --- charts/haproxy-operator/Chart.yaml | 10 ++++++++-- release-please-config.json | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/charts/haproxy-operator/Chart.yaml b/charts/haproxy-operator/Chart.yaml index fa4a1d8..bc6b4aa 100644 --- a/charts/haproxy-operator/Chart.yaml +++ b/charts/haproxy-operator/Chart.yaml @@ -3,6 +3,12 @@ name: haproxy-operator description: >- Kubernetes operator that reconciles HAProxy configuration via the Dataplane API -version: 0.3.0 -appVersion: 0.2.0 +# Chart version and app version are kept in lockstep with the +# release-please lineage — both lines carry the `x-release-please-version` +# marker so every release bumps them together, and CI stamps the same +# string into both fields at publish time. This keeps the GitHub release, +# git tag, image tag, and chart OCI tag identical so operators can trace +# any deployed pod back to a single version string. +version: 0.3.0 # x-release-please-version +appVersion: "0.3.0" # x-release-please-version type: application diff --git a/release-please-config.json b/release-please-config.json index b1b2f6d..6397153 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -13,7 +13,10 @@ "release-as": "0.3.0", "prerelease": false, "extra-files": [ - "charts/haproxy-operator/Chart.yaml" + { + "type": "generic", + "path": "charts/haproxy-operator/Chart.yaml" + } ] } }