Merge pull request #1465 from fluxcd/release-v1.5.4

Release v1.5.4

Author: matheuscscp

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 1.5.4
+
+**Release date:** 2026-04-21
+
+This patch release fixes a post-renderer conflict between overlapping hooks
+and templates, and preserves line endings in `SplitManifests` for downstream
+YAML parsers. It also ensures force-replace is ignored when server-side apply
+is enabled.
+
+Fixes:
+- Ignore force replace when server-side apply is enabled
+  [#1456](https://github.com/fluxcd/helm-controller/pull/1456)
+- Fix post-renderer conflict of overlapping hooks and templates
+  [#1461](https://github.com/fluxcd/helm-controller/pull/1461)
+
 ## 1.5.3
 
 **Release date:** 2026-03-16

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ resources:
 images:
   - name: fluxcd/helm-controller
     newName: fluxcd/helm-controller
-    newTag: v1.5.3
+    newTag: v1.5.4

go.mod

@@ -20,7 +20,7 @@ replace (
 require (
 	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/fluxcd/cli-utils v0.37.2-flux.1
-	github.com/fluxcd/helm-controller/api v1.5.3
+	github.com/fluxcd/helm-controller/api v1.5.4
 	github.com/fluxcd/pkg/apis/acl v0.9.0
 	github.com/fluxcd/pkg/apis/event v0.24.1
 	github.com/fluxcd/pkg/apis/kustomize v1.15.1