Skip to content

[release/v1.5.x] Fix post-renderer conflict of overlapping hooks and templates #1461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matheuscscp merged 1 commit into from
Apr 17, 2026
Merged

[release/v1.5.x] Fix post-renderer conflict of overlapping hooks and templates #1461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ go 1.26.0

replace github.com/fluxcd/helm-controller/api => ./api

// TODO: Remove this after Helm 4.1.4 comes out.
// This fixes the following bugs:
// - https://github.com/helm/helm/issues/31867
// - https://github.com/helm/helm/issues/31935
replace helm.sh/helm/v4 => github.com/fluxcd/helm/v4 v4.1.4-flux.1
// TODO: Remove this after Helm 4.2 comes out.
replace helm.sh/helm/v4 => github.com/fluxcd/helm/v4 v4.1.4-flux.3

// Replace digest lib to master to gather access to BLAKE3.
// xref: https://github.com/opencontainers/go-digest/pull/66
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/fluxcd/cli-utils v0.37.2-flux.1 h1:tQ588ghtRN+E+kHq415FddfqA9v4brn/1WWgrP6rQR0=
github.com/fluxcd/cli-utils v0.37.2-flux.1/go.mod h1:LcWSu1NYET8d8U7O326RhEm5JkQXCMK6ITu4G1CT02c=
github.com/fluxcd/helm/v4 v4.1.4-flux.1 h1:ntm0bY/1VrqfsJbxlmAVxryGJoFcM5AySHiow/K2268=
github.com/fluxcd/helm/v4 v4.1.4-flux.1/go.mod h1:5dSo8rRgn3OTkDAc/k0Ipw5/Q+BlqKIKZwa0XwSiINI=
github.com/fluxcd/helm/v4 v4.1.4-flux.3 h1:KAKl2gfut/3PVmpRVpD+eIAwh6wx/BklULfRl3VDjf0=
github.com/fluxcd/helm/v4 v4.1.4-flux.3/go.mod h1:5dSo8rRgn3OTkDAc/k0Ipw5/Q+BlqKIKZwa0XwSiINI=
github.com/fluxcd/pkg/apis/acl v0.9.0 h1:wBpgsKT+jcyZEcM//OmZr9RiF8klL3ebrDp2u2ThsnA=
github.com/fluxcd/pkg/apis/acl v0.9.0/go.mod h1:TttNS+gocsGLwnvmgVi3/Yscwqrjc17+vhgYfqkfrV4=
github.com/fluxcd/pkg/apis/event v0.24.1 h1:TClVdn02aiq3sAl9BuzLjjTIxm3JJ83fJ9nchtBa4qg=
Expand Down
2 changes: 2 additions & 0 deletions internal/action/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"fmt"

"helm.sh/helm/v4/pkg/action"
helmaction "helm.sh/helm/v4/pkg/action"
helmchartutil "helm.sh/helm/v4/pkg/chart/common"
helmchart "helm.sh/helm/v4/pkg/chart/v2"
Expand Down Expand Up @@ -108,6 +109,7 @@ func newInstall(config *helmaction.Configuration, obj *v2.HelmRelease, opts []In
}

install.PostRenderer = postrender.BuildPostRenderers(obj)
install.PostRenderStrategy = action.PostRenderStrategyNoHooks

for _, opt := range opts {
opt(install)
Expand Down
2 changes: 2 additions & 0 deletions internal/action/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"errors"
"fmt"

"helm.sh/helm/v4/pkg/action"
helmaction "helm.sh/helm/v4/pkg/action"
helmchartutil "helm.sh/helm/v4/pkg/chart/common"
helmchart "helm.sh/helm/v4/pkg/chart/v2"
Expand Down Expand Up @@ -126,6 +127,7 @@ func newUpgrade(config *helmaction.Configuration, obj *v2.HelmRelease, opts []Up
}

upgrade.PostRenderer = postrender.BuildPostRenderers(obj)
upgrade.PostRenderStrategy = action.PostRenderStrategyNoHooks

for _, opt := range opts {
opt(upgrade)
Expand Down
Loading