From 3fb05940aa176caff006816808c94c236239e3e1 Mon Sep 17 00:00:00 2001 From: Artem Kuleshov Date: Mon, 27 Apr 2026 13:24:26 +0300 Subject: [PATCH] [module-sdk] add OnBeforeDeleteHelm binding to module hook config Signed-off-by: Artem Kuleshov --- internal/controller/controller.go | 6 ++++++ pkg/hook.go | 18 ++++++++++-------- pkg/hook/dto.go | 11 ++++++----- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/internal/controller/controller.go b/internal/controller/controller.go index 98435c97..e335afad 100644 --- a/internal/controller/controller.go +++ b/internal/controller/controller.go @@ -295,6 +295,9 @@ func remapModuleHookConfig(cfg *pkg.HookConfig, out *gohook.HookConfig) { if cfg.OnAfterHelm != nil { out.OnAfterHelm = ptr.To(cfg.OnAfterHelm.Order) } + if cfg.OnBeforeDeleteHelm != nil { + out.OnBeforeDeleteHelm = ptr.To(cfg.OnBeforeDeleteHelm.Order) + } if cfg.OnAfterDeleteHelm != nil { out.OnAfterDeleteHelm = ptr.To(cfg.OnAfterDeleteHelm.Order) } @@ -323,6 +326,9 @@ func remapApplicationHookConfig(cfg *pkg.ApplicationHookConfig, out *gohook.Hook if cfg.OnAfterHelm != nil { out.OnAfterHelm = ptr.To(cfg.OnAfterHelm.Order) } + if cfg.OnBeforeDeleteHelm != nil { + out.OnBeforeDeleteHelm = ptr.To(cfg.OnBeforeDeleteHelm.Order) + } if cfg.OnAfterDeleteHelm != nil { out.OnAfterDeleteHelm = ptr.To(cfg.OnAfterDeleteHelm.Order) } diff --git a/pkg/hook.go b/pkg/hook.go index 99bdf3fd..3c5208be 100644 --- a/pkg/hook.go +++ b/pkg/hook.go @@ -138,10 +138,11 @@ type HookConfig struct { // OnStartup runs hook on module/global startup // Attention! During the startup you don't have snapshots available // use native KubeClient to fetch resources - OnStartup *OrderedConfig - OnBeforeHelm *OrderedConfig - OnAfterHelm *OrderedConfig - OnAfterDeleteHelm *OrderedConfig + OnStartup *OrderedConfig + OnBeforeHelm *OrderedConfig + OnAfterHelm *OrderedConfig + OnBeforeDeleteHelm *OrderedConfig + OnAfterDeleteHelm *OrderedConfig AllowFailure bool Queue string @@ -195,10 +196,11 @@ type ApplicationHookConfig struct { // OnStartup runs hook on application startup // Attention! During the startup you don't have snapshots available // use native KubeClient to fetch resources - OnStartup *OrderedConfig - OnBeforeHelm *OrderedConfig - OnAfterHelm *OrderedConfig - OnAfterDeleteHelm *OrderedConfig + OnStartup *OrderedConfig + OnBeforeHelm *OrderedConfig + OnAfterHelm *OrderedConfig + OnBeforeDeleteHelm *OrderedConfig + OnAfterDeleteHelm *OrderedConfig AllowFailure bool Queue string diff --git a/pkg/hook/dto.go b/pkg/hook/dto.go index 2cfe6e98..9ad616c6 100644 --- a/pkg/hook/dto.go +++ b/pkg/hook/dto.go @@ -32,11 +32,12 @@ type HookConfig struct { // OnStartup runs hook on module/global startup // Attention! During the startup you don't have snapshots available // use native KubeClient to fetch resources - OnStartup *uint `yaml:"onStartup,omitempty" json:"onStartup,omitempty"` - OnBeforeHelm *uint `yaml:"beforeHelm,omitempty" json:"beforeHelm,omitempty"` - OnAfterHelm *uint `yaml:"afterHelm,omitempty" json:"afterHelm,omitempty"` - OnAfterDeleteHelm *uint `yaml:"afterDeleteHelm,omitempty" json:"afterDeleteHelm,omitempty"` - AllowFailure *bool `yaml:"allowFailure,omitempty" json:"allowFailure,omitempty"` + OnStartup *uint `yaml:"onStartup,omitempty" json:"onStartup,omitempty"` + OnBeforeHelm *uint `yaml:"beforeHelm,omitempty" json:"beforeHelm,omitempty"` + OnAfterHelm *uint `yaml:"afterHelm,omitempty" json:"afterHelm,omitempty"` + OnBeforeDeleteHelm *uint `yaml:"beforeDeleteHelm,omitempty" json:"beforeDeleteHelm,omitempty"` + OnAfterDeleteHelm *uint `yaml:"afterDeleteHelm,omitempty" json:"afterDeleteHelm,omitempty"` + AllowFailure *bool `yaml:"allowFailure,omitempty" json:"allowFailure,omitempty"` Settings *HookConfigSettings `yaml:"settings,omitempty" json:"settings,omitempty"`