Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions internal/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
18 changes: 10 additions & 8 deletions pkg/hook.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions pkg/hook/dto.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
Loading