fluxcd
/
helm-controller
mirror of https://github.com/fluxcd/helm-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

action: add name param to rollback and uninstall 

This gives more fine-grain control over what release must be targeted,
as we do not always want to rely on the current spec but rather on e.g.
a release we have made ourselves with a previous configuration for
garbage collection purposes.

Signed-off-by: Hidde Beydals <hello@hidde.co>
This commit is contained in:
Hidde Beydals 2022-09-15 14:40:48 +00:00 committed by Hidde Beydals
parent 9812286bb4
commit 026fd45c2c
No known key found for this signature in database
GPG Key ID: 979F380FC2341744
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/action/rollback.go
View File

@ -35,9 +35,9 @@ type RollbackOption func(*helmaction.Rollback)
// expected to be done by the caller. In addition, it does not take note of the
// action result. The caller is expected to listen to this using a
// storage.ObserveFunc, which provides superior access to Helm storage writes.
func Rollback(config *helmaction.Configuration, obj *v2.HelmRelease, opts ...RollbackOption) error {
func Rollback(config *helmaction.Configuration, obj *v2.HelmRelease, releaseName string, opts ...RollbackOption) error {
rollback := newRollback(config, obj, opts)
return rollback.Run(obj.GetReleaseName())
return rollback.Run(releaseName)
}
func newRollback(config *helmaction.Configuration, obj *v2.HelmRelease, opts []RollbackOption) *helmaction.Rollback {

6
internal/action/uninstall.go
View File

@ -28,7 +28,7 @@ import (
// UninstallOption can be used to modify Helm's action.Uninstall after the
// instructions from the v2beta2.HelmRelease have been applied. This is for
// example useful to enable the dry-run setting as a CLI.
type UninstallOption func(*helmaction.Uninstall)
type UninstallOption func(cfg *helmaction.Uninstall)
// Uninstall runs the Helm uninstall action with the provided config, using the
// v2beta2.HelmReleaseSpec of the given object to determine the target release
@ -38,9 +38,9 @@ type UninstallOption func(*helmaction.Uninstall)
// expected to be done by the caller. In addition, it does not take note of the
// action result. The caller is expected to listen to this using a
// storage.ObserveFunc, which provides superior access to Helm storage writes.
func Uninstall(_ context.Context, config *helmaction.Configuration, obj *v2.HelmRelease, opts ...UninstallOption) (*helmrelease.UninstallReleaseResponse, error) {
func Uninstall(_ context.Context, config *helmaction.Configuration, obj *v2.HelmRelease, releaseName string, opts ...UninstallOption) (*helmrelease.UninstallReleaseResponse, error) {
uninstall := newUninstall(config, obj, opts)
return uninstall.Run(obj.GetReleaseName())
return uninstall.Run(releaseName)
}
func newUninstall(config *helmaction.Configuration, obj *v2.HelmRelease, opts []UninstallOption) *helmaction.Uninstall {

2
internal/reconcile/rollback.go
View File

@ -56,7 +56,7 @@ func (r *Rollback) Reconcile(ctx context.Context, req *Request) error {
}
// Run rollback action.
if err := action.Rollback(r.configFactory.Build(logBuf.Log, observeRollback(req.Object)), req.Object); err != nil {
if err := action.Rollback(r.configFactory.Build(logBuf.Log, observeRollback(req.Object)), req.Object, cur.Name); err != nil {
// Mark failure on object.
req.Object.Status.Failures++
conditions.MarkFalse(req.Object, v2.RemediatedCondition, v2.RollbackFailedReason, err.Error())

2
internal/reconcile/uninstall.go
View File

@ -49,7 +49,7 @@ func (r *Uninstall) Reconcile(ctx context.Context, req *Request) error {
}
// Run the uninstall action.
res, err := action.Uninstall(ctx, cfg, req.Object)
res, err := action.Uninstall(ctx, cfg, req.Object, cur.Name)
// The Helm uninstall action does always target the latest release. Before
// accepting results, we need to confirm this is actually the release we