Skip to content

fix(flux): ensure suspending a Flux release is honored #1413

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
IvoGoman merged 3 commits into from
Sep 19, 2025
Merged

fix(flux): ensure suspending a Flux release is honored #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b462ac
fix(flux): ensure suspending a Flux release is honored
IvoGoman Sep 18, 2025
36a1fee
Merge branch 'main' into fix/keep-suspend
IvoGoman Sep 19, 2025
85c9a67
Merge branch 'main' into fix/keep-suspend
IvoGoman Sep 19, 2025
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
1 change: 1 addition & 0 deletions internal/controller/plugin/plugin_controller_flux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ func (r *PluginReconciler) EnsureFluxCreated(ctx context.Context, plugin *greenh
WithDriftDetection(&helmv2.DriftDetection{
Mode: helmv2.DriftDetectionEnabled,
}).
WithSuspend(release.Spec.Suspend).
WithKubeConfig(fluxmeta.SecretKeyReference{
Name: plugin.Spec.ClusterName,
Key: greenhouseapis.GreenHouseKubeConfigKey,
Expand Down
7 changes: 7 additions & 0 deletions internal/flux/helm_release_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ type HelmReleaseBuilder interface {
WithUpgrade(upgrade *helmv2.Upgrade) *helmReleaseBuilder
WithRollback(rollback *helmv2.Rollback) *helmReleaseBuilder
WithDriftDetection(driftDetection *helmv2.DriftDetection) *helmReleaseBuilder
WithSuspend(suspend bool) *helmReleaseBuilder
WithTest(test *helmv2.Test) *helmReleaseBuilder
WithUninstall(uninstall *helmv2.Uninstall) *helmReleaseBuilder
WithDependsOn(dependencies []fluxmeta.NamespacedObjectReference) *helmReleaseBuilder
Expand Down Expand Up @@ -177,6 +178,12 @@ func (b *helmReleaseBuilder) WithDriftDetection(driftDetection *helmv2.DriftDete
return b
}

// WithSuspend sets the suspend flag for the Helm release.
func (b *helmReleaseBuilder) WithSuspend(suspend bool) *helmReleaseBuilder {
b.spec.Suspend = suspend
return b
}

// WithTest sets the test configuration for the Helm release.
func (b *helmReleaseBuilder) WithTest(test *helmv2.Test) *helmReleaseBuilder {
if test == nil {
Expand Down
Loading