Skip to content

Commit 3fb0594

Browse files
committed
[module-sdk] add OnBeforeDeleteHelm binding to module hook config
Signed-off-by: Artem Kuleshov <artem.kuleshov@flant.com>
1 parent 905697b commit 3fb0594

3 files changed

Lines changed: 22 additions & 13 deletions

File tree

internal/controller/controller.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ func remapModuleHookConfig(cfg *pkg.HookConfig, out *gohook.HookConfig) {
295295
if cfg.OnAfterHelm != nil {
296296
out.OnAfterHelm = ptr.To(cfg.OnAfterHelm.Order)
297297
}
298+
if cfg.OnBeforeDeleteHelm != nil {
299+
out.OnBeforeDeleteHelm = ptr.To(cfg.OnBeforeDeleteHelm.Order)
300+
}
298301
if cfg.OnAfterDeleteHelm != nil {
299302
out.OnAfterDeleteHelm = ptr.To(cfg.OnAfterDeleteHelm.Order)
300303
}
@@ -323,6 +326,9 @@ func remapApplicationHookConfig(cfg *pkg.ApplicationHookConfig, out *gohook.Hook
323326
if cfg.OnAfterHelm != nil {
324327
out.OnAfterHelm = ptr.To(cfg.OnAfterHelm.Order)
325328
}
329+
if cfg.OnBeforeDeleteHelm != nil {
330+
out.OnBeforeDeleteHelm = ptr.To(cfg.OnBeforeDeleteHelm.Order)
331+
}
326332
if cfg.OnAfterDeleteHelm != nil {
327333
out.OnAfterDeleteHelm = ptr.To(cfg.OnAfterDeleteHelm.Order)
328334
}

pkg/hook.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,11 @@ type HookConfig struct {
138138
// OnStartup runs hook on module/global startup
139139
// Attention! During the startup you don't have snapshots available
140140
// use native KubeClient to fetch resources
141-
OnStartup *OrderedConfig
142-
OnBeforeHelm *OrderedConfig
143-
OnAfterHelm *OrderedConfig
144-
OnAfterDeleteHelm *OrderedConfig
141+
OnStartup *OrderedConfig
142+
OnBeforeHelm *OrderedConfig
143+
OnAfterHelm *OrderedConfig
144+
OnBeforeDeleteHelm *OrderedConfig
145+
OnAfterDeleteHelm *OrderedConfig
145146

146147
AllowFailure bool
147148
Queue string
@@ -195,10 +196,11 @@ type ApplicationHookConfig struct {
195196
// OnStartup runs hook on application startup
196197
// Attention! During the startup you don't have snapshots available
197198
// use native KubeClient to fetch resources
198-
OnStartup *OrderedConfig
199-
OnBeforeHelm *OrderedConfig
200-
OnAfterHelm *OrderedConfig
201-
OnAfterDeleteHelm *OrderedConfig
199+
OnStartup *OrderedConfig
200+
OnBeforeHelm *OrderedConfig
201+
OnAfterHelm *OrderedConfig
202+
OnBeforeDeleteHelm *OrderedConfig
203+
OnAfterDeleteHelm *OrderedConfig
202204

203205
AllowFailure bool
204206
Queue string

pkg/hook/dto.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,12 @@ type HookConfig struct {
3232
// OnStartup runs hook on module/global startup
3333
// Attention! During the startup you don't have snapshots available
3434
// use native KubeClient to fetch resources
35-
OnStartup *uint `yaml:"onStartup,omitempty" json:"onStartup,omitempty"`
36-
OnBeforeHelm *uint `yaml:"beforeHelm,omitempty" json:"beforeHelm,omitempty"`
37-
OnAfterHelm *uint `yaml:"afterHelm,omitempty" json:"afterHelm,omitempty"`
38-
OnAfterDeleteHelm *uint `yaml:"afterDeleteHelm,omitempty" json:"afterDeleteHelm,omitempty"`
39-
AllowFailure *bool `yaml:"allowFailure,omitempty" json:"allowFailure,omitempty"`
35+
OnStartup *uint `yaml:"onStartup,omitempty" json:"onStartup,omitempty"`
36+
OnBeforeHelm *uint `yaml:"beforeHelm,omitempty" json:"beforeHelm,omitempty"`
37+
OnAfterHelm *uint `yaml:"afterHelm,omitempty" json:"afterHelm,omitempty"`
38+
OnBeforeDeleteHelm *uint `yaml:"beforeDeleteHelm,omitempty" json:"beforeDeleteHelm,omitempty"`
39+
OnAfterDeleteHelm *uint `yaml:"afterDeleteHelm,omitempty" json:"afterDeleteHelm,omitempty"`
40+
AllowFailure *bool `yaml:"allowFailure,omitempty" json:"allowFailure,omitempty"`
4041

4142
Settings *HookConfigSettings `yaml:"settings,omitempty" json:"settings,omitempty"`
4243

0 commit comments

Comments
 (0)