diff --git a/plugins/scheduler-k3s/Makefile b/plugins/scheduler-k3s/Makefile index 3ea295207..776266dec 100644 --- a/plugins/scheduler-k3s/Makefile +++ b/plugins/scheduler-k3s/Makefile @@ -1,5 +1,5 @@ SUBCOMMANDS = subcommands/initialize subcommands/report subcommands/set subcommands/show-kubeconfig -TRIGGERS = triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/post-registry-login triggers/report triggers/scheduler-deploy triggers/scheduler-enter triggers/scheduler-logs triggers/scheduler-run triggers/scheduler-stop +TRIGGERS = triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/post-registry-login triggers/report triggers/scheduler-deploy triggers/scheduler-enter triggers/scheduler-logs triggers/scheduler-post-delete triggers/scheduler-run triggers/scheduler-stop BUILD = commands subcommands triggers PLUGIN_NAME = scheduler-k3s diff --git a/plugins/scheduler-k3s/src/triggers/triggers.go b/plugins/scheduler-k3s/src/triggers/triggers.go index 392dbb0e6..f0c64098a 100644 --- a/plugins/scheduler-k3s/src/triggers/triggers.go +++ b/plugins/scheduler-k3s/src/triggers/triggers.go @@ -89,6 +89,10 @@ func main() { scheduler := flag.Arg(0) appName := flag.Arg(1) err = scheduler_k3s.TriggerSchedulerStop(scheduler, appName) + case "scheduler-post-delete": + scheduler := flag.Arg(0) + appName := flag.Arg(1) + err = scheduler_k3s.TriggerSchedulerPostDelete(scheduler, appName) case "scheduler-run": var envCount int scheduler := flag.Arg(0) diff --git a/plugins/scheduler-k3s/triggers.go b/plugins/scheduler-k3s/triggers.go index 24f8898e6..b709088b4 100644 --- a/plugins/scheduler-k3s/triggers.go +++ b/plugins/scheduler-k3s/triggers.go @@ -69,8 +69,11 @@ func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error { return nil } -// TriggerPostDelete destroys the scheduler-k3s data for a given app container -func TriggerPostDelete(appName string) error { +// TriggerSchedulerPostDelete destroys the scheduler-k3s data for a given app container +func TriggerSchedulerPostDelete(scheduler string, appName string) error { + if scheduler != "k3s" { + return nil + } namespace := common.PropertyGetDefault("scheduler-k3s", appName, "namespace", "default") helmAgent, err := NewHelmAgent(namespace, DeployLogPrinter) if err != nil { @@ -82,6 +85,11 @@ func TriggerPostDelete(appName string) error { return fmt.Errorf("Error uninstalling chart: %w", err) } + return nil +} + +// TriggerPostDelete destroys the scheduler-k3s data for a given app container +func TriggerPostDelete(appName string) error { dataErr := common.RemoveAppDataDirectory("scheduler-k3s", appName) propertyErr := common.PropertyDestroy("scheduler-k3s", appName)